Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52f34c89 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix format string warnings"

parents a4c8a32c 843328ff

drm/mediacas/plugins/clearkey/ClearKeyFetcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 %" PRIu64 " to %" PRIu64, asset_.id(), *asset_id);

        ALOGW("Asset_id change from %llu to %" PRIu64, asset_.id(), *asset_id);

        asset_.Clear();

    }

drm/mediacas/plugins/mock/MockCasPlugin.cpp

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ status_t MockCasPlugin::processEcm( 
    if (session == NULL) {

        return BAD_VALUE;

    }

    ALOGV("ECM: size=%d", ecm.size());

    ALOGV("ECM: size=%zu", ecm.size());

    ALOGV("ECM: data=%s", arrayToString(ecm).string());



    return OK;
@@ -156,7 +156,7 @@ status_t MockCasPlugin::processEmm(const CasEmm& emm) { 
    ALOGV("processEmm");

    Mutex::Autolock lock(mLock);



    ALOGV("EMM: size=%d", emm.size());

    ALOGV("EMM: size=%zu", emm.size());

    ALOGV("EMM: data=%s", arrayToString(emm).string());



    return OK;