Adapt to google::protobuf::uint64 type change

Protobuf 3.9.1 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: Idb741c8be97df1c752083350fb8fed257903944c
Merged-In: Idb741c8be97df1c752083350fb8fed257903944c
gugelfrei
Colin Cross 6 years ago
parent 1210f45ea7
commit 4a420a6c7b

@ -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();
}

@ -17,6 +17,8 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "ecm"
#include <inttypes.h>
#include "ecm.h"
#include "ecm_generator.h"
#include "protos/license_protos.pb.h"
@ -76,7 +78,7 @@ status_t Ecm::Decrypt(
return status;
}
if (asset.id() != asset_from_emm.id()) {
ALOGE("Asset_id from Emm (%llu) does not match asset_id from Ecm (%llu).",
ALOGE("Asset_id from Emm (%" PRIu64 ") does not match asset_id from Ecm (%" PRIu64 ").",
asset_from_emm.id(), asset.id());
return CLEARKEY_STATUS_INVALID_PARAMETER;
}

Loading…
Cancel
Save