diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp
index 5917fed1..f36e3c4a 100644
--- a/libwvdrmengine/cdm/core/src/cdm_session.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp
@@ -355,27 +355,22 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) {
 
   CdmResponseType status = crypto_session_->Decrypt(params);
 
-  switch (status) {
-    case NO_ERROR: {
-      if (is_initial_decryption_) {
-        policy_engine_->BeginDecryption();
-        is_initial_decryption_ = false;
-      }
-      has_decrypted_since_last_report_ = true;
-      if (!is_usage_update_needed_) {
-        is_usage_update_needed_ =
-            !license_parser_->provider_session_token().empty();
-      }
-      break;
+  if (status == NO_ERROR) {
+    if (is_initial_decryption_) {
+      policy_engine_->BeginDecryption();
+      is_initial_decryption_ = false;
     }
-    case UNKNOWN_ERROR: {
-      Clock clock;
-      int64_t current_time = clock.GetCurrentTime();
-      if (policy_engine_->IsLicenseDurationExpired(current_time) ||
-          policy_engine_->IsPlaybackDurationExpired(current_time)) {
-        return NEED_KEY;
-      }
-      break;
+    has_decrypted_since_last_report_ = true;
+    if (!is_usage_update_needed_) {
+      is_usage_update_needed_ =
+          !license_parser_->provider_session_token().empty();
+    }
+  } else {
+    Clock clock;
+    int64_t current_time = clock.GetCurrentTime();
+    if (policy_engine_->IsLicenseDurationExpired(current_time) ||
+        policy_engine_->IsPlaybackDurationExpired(current_time)) {
+      return NEED_KEY;
     }
   }
 
diff --git a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
index ed3d9748..0fcda278 100644
--- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp
@@ -1818,7 +1818,7 @@ TEST_P(DeviceFilesUsageInfoTest, Read) {
   std::vector<std::pair<CdmKeyMessage, CdmKeyResponse> > license_info;
   ASSERT_TRUE(device_files.RetrieveUsageInfo(app_id, &license_info));
   if (index >= 0) {
-    EXPECT_EQ(index, license_info.size());
+    EXPECT_EQ(static_cast<size_t>(index), license_info.size());
     for (size_t i = 0; i < license_info.size(); ++i) {
       bool found = false;
       for (size_t j = 0; j <= static_cast<size_t>(index); ++j) {
@@ -1832,7 +1832,7 @@ TEST_P(DeviceFilesUsageInfoTest, Read) {
       EXPECT_TRUE(found);
     }
   } else {
-    EXPECT_EQ(0, license_info.size());
+    EXPECT_EQ(0u, license_info.size());
   }
 }
 
diff --git a/libwvdrmengine/cdm/core/test/http_socket_test.cpp b/libwvdrmengine/cdm/core/test/http_socket_test.cpp
index ed8e660e..4dfb4b09 100644
--- a/libwvdrmengine/cdm/core/test/http_socket_test.cpp
+++ b/libwvdrmengine/cdm/core/test/http_socket_test.cpp
@@ -159,7 +159,7 @@ ParseUrlTests parse_url_tests[] = {
      8888,                        // port
      "/",                         // path
     },
-    {NULL}  // list terminator
+    {NULL, NULL, false, NULL, 0, NULL}  // list terminator
 };
 
 TEST_F(HttpSocketTest, ParseUrlTest) {
diff --git a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
index 73c499ad..e23ac0a4 100644
--- a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
+++ b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
@@ -832,7 +832,7 @@ TEST_F(PolicyEngineTest, QuerySuccess_LicenseNotReceived) {
 
   CdmQueryMap query_info;
   EXPECT_EQ(NO_ERROR, policy_engine_->Query(&query_info));
-  EXPECT_EQ(0, query_info.size());
+  EXPECT_EQ(0u, query_info.size());
 }
 
 TEST_F(PolicyEngineTest, QuerySuccess_LicenseStartTimeNotSet) {
diff --git a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
index 72fe7eeb..649f66ae 100644
--- a/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
+++ b/libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
@@ -763,8 +763,8 @@ TEST_F(WvCdmExtendedDurationTest, VerifyLicenseRenewalTest) {
 
   // Verify license identification
   video_widevine_server::sdk::LicenseIdentification license_id = license.id();
-  EXPECT_LT(0, license_id.request_id().size());
-  EXPECT_LT(0, license_id.session_id().size());
+  EXPECT_LT(0u, license_id.request_id().size());
+  EXPECT_LT(0u, license_id.session_id().size());
   EXPECT_EQ(video_widevine_server::sdk::STREAMING, license_id.type());
   EXPECT_FALSE(license_id.has_provider_session_token());
 
diff --git a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
index c6f56c2d..6be7bb4b 100644
--- a/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/src/WVDrmPlugin.cpp
@@ -915,7 +915,7 @@ status_t WVDrmPlugin::verify(const Vector<uint8_t>& sessionId,
   }
 }
 
-status_t WVDrmPlugin::signRSA(const Vector<uint8_t>& sessionId,
+status_t WVDrmPlugin::signRSA(const Vector<uint8_t>& /* sessionId */,
                               const String8& algorithm,
                               const Vector<uint8_t>& message,
                               const Vector<uint8_t>& wrappedKey,