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

Commit 9e96ca0a authored by Hassan Shojania's avatar Hassan Shojania Committed by Android (Google) Code Review
Browse files

Merge "Fix format string for Modular DRM for MediaPlayer"

parents bf2484a3 e00e3922

media/libmediaplayerservice/nuplayer/NuPlayerDrm.cpp

+2 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ NuPlayerDrm::CryptoInfo *NuPlayerDrm::getSampleCryptoInfo(sp<MetaData> meta) 
    size_t keysize;

    if (meta->findData(kKeyCryptoKey, &type, &key, &keysize)) {

        if (keysize != kBlockSize) {

            ALOGE("getSampleCryptoInfo Keys must be %zu bytes in length: %zu",

            ALOGE("getSampleCryptoInfo Keys must be %d bytes in length: %zu",

                    kBlockSize, keysize);

            // Keys must be 16 bytes in length.

            return NULL;
@@ -342,7 +342,7 @@ NuPlayerDrm::CryptoInfo *NuPlayerDrm::getSampleCryptoInfo(sp<MetaData> meta) 
    size_t ivsize;

    if (meta->findData(kKeyCryptoIV, &type, &iv, &ivsize)) {

        if (ivsize != kBlockSize) {

            ALOGE("getSampleCryptoInfo IV must be %zu bytes in length: %zu",

            ALOGE("getSampleCryptoInfo IV must be %d bytes in length: %zu",

                    kBlockSize, ivsize);

            // IVs must be 16 bytes in length.

            return NULL;