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