diff options
| author | Colin Cross <ccross@android.com> | 2018-10-26 13:22:17 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-10-26 13:22:17 -0700 |
| commit | 3feee7ee05ab0227435515a07d3bb5907f17715a (patch) | |
| tree | de28a5f00dc75e80b6a944bf73922d2bea275aa0 /drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp | |
| parent | 8ecc7c198cd0901c37af2159fdd1c005b55d108d (diff) | |
| download | frameworks_av-3feee7ee05ab0227435515a07d3bb5907f17715a.tar.gz frameworks_av-3feee7ee05ab0227435515a07d3bb5907f17715a.tar.bz2 frameworks_av-3feee7ee05ab0227435515a07d3bb5907f17715a.zip | |
Adapt to google::protobuf::uint64 type change
Protobuf 3.5.2 redefines google::protobuf::uint64 from unsigned long
long to uint64_t, which is sometimes unsigned long and sometimes
unsigned long long. Use PRIu64 to print it.
Bug: 117607748
Test: m checkbuild
Change-Id: Ifdbc33cdafca5b82a1ffbcbfa4e292a819deb244
Diffstat (limited to 'drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp')
| -rw-r--r-- | drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp b/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp index eaa3390d0b..cb69f911ff 100644 --- a/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp +++ b/drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp @@ -89,7 +89,7 @@ status_t ClearKeyFetcher::ObtainKey(const sp<ABuffer>& buffer, // asset_id change. If it sends an EcmContainer with 2 Ecms with different // asset_ids (old and new) then it might be best to prefetch the Emm. if ((asset_.id() != 0) && (*asset_id != asset_.id())) { - ALOGW("Asset_id change from %llu to %" PRIu64, asset_.id(), *asset_id); + ALOGW("Asset_id change from %" PRIu64 " to %" PRIu64, asset_.id(), *asset_id); asset_.Clear(); } |