Merge "Fix format string warnings"

gugelfrei
Chih-hung Hsieh 7 years ago committed by Gerrit Code Review
commit b50a7dcded

@ -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_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. // asset_ids (old and new) then it might be best to prefetch the Emm.
if ((asset_.id() != 0) && (*asset_id != asset_.id())) { if ((asset_.id() != 0) && (*asset_id != asset_.id())) {
ALOGW("Asset_id change from %" PRIu64 " to %" PRIu64, asset_.id(), *asset_id); ALOGW("Asset_id change from %llu to %" PRIu64, asset_.id(), *asset_id);
asset_.Clear(); asset_.Clear();
} }

@ -146,7 +146,7 @@ status_t MockCasPlugin::processEcm(
if (session == NULL) { if (session == NULL) {
return BAD_VALUE; return BAD_VALUE;
} }
ALOGV("ECM: size=%d", ecm.size()); ALOGV("ECM: size=%zu", ecm.size());
ALOGV("ECM: data=%s", arrayToString(ecm).string()); ALOGV("ECM: data=%s", arrayToString(ecm).string());
return OK; return OK;
@ -156,7 +156,7 @@ status_t MockCasPlugin::processEmm(const CasEmm& emm) {
ALOGV("processEmm"); ALOGV("processEmm");
Mutex::Autolock lock(mLock); Mutex::Autolock lock(mLock);
ALOGV("EMM: size=%d", emm.size()); ALOGV("EMM: size=%zu", emm.size());
ALOGV("EMM: data=%s", arrayToString(emm).string()); ALOGV("EMM: data=%s", arrayToString(emm).string());
return OK; return OK;

Loading…
Cancel
Save