| commit | f93e0b5bba0aa7d92c8f9203f60075b371b63a69 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Sep 18 11:41:56 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 18 11:41:56 2020 +0000 |
| tree | 95582df40daa60e2bacb0d2ef782fa083372aee5 | |
| parent | 293d17f3817f2be367bded7519d66ecc92493943 [diff] | |
| parent | d62dbc58fa6d0c74d6cf06d25f9540e1a619ac2b [diff] |
Merge "Fix 64-bit build issues" am: 5533d0cd4f am: 9c78c5c239 am: 3fe7cd59db am: d62dbc58fa Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1426349 Change-Id: I9f0c59f2f14d52676e7ede7ed48e8f893b500976
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(