commit f7f95ead5d5cb82a67eaa58953344ff374a4d190
author Bill Yi <byi@google.com> Fri Sep 18 18:47:48 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 18 18:47:48 2020 +0000
tree 0b8dbfb568e5d15c8bc38bda98cbb91504a8fecd
parent 5533d0cd4f323a6409b24f8ec5811594b23e342f
parent e8120652733ed1ee9cdb6fe1b34aadd04824c3f1

Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"

drm/drmserver/DrmManager.cpp

diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index 9a32cc5..74e3223 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -99,13 +99,13 @@
         }
         default:
         {
-            ALOGW("Unrecognized message type: %zd", msg->what());
+            ALOGW("Unrecognized message type: %u", msg->what());
         }
     }
 }
 
 int64_t DrmManager::getMetricsFlushPeriodUs() {
-    return 1000 * 1000 * std::max(1ll, property_get_int64("drmmanager.metrics.period", 86400));
+    return 1000 * 1000 * std::max(1ll, (long long)property_get_int64("drmmanager.metrics.period", 86400));
 }
 
 void DrmManager::recordEngineMetrics(