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

Commit 91ed0442 authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "MediaCryptoException: human readable error codes" into sc-dev am: f5e313dc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13639134

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9672554949b008b38c89c17f5bb5860b17626e7
parents 78998770 f5e313dc

media/jni/android_media_MediaCrypto.cpp

+5 −3
Original line number Diff line number Diff line
@@ -202,10 +202,11 @@ static void android_media_MediaCrypto_native_setup( 
    uuid = NULL;



    if (err != OK) {

        jniThrowException(

        std::string strerr(StrCryptoError(err));

        jniThrowExceptionFmt(

                env,

                "android/media/MediaCryptoException",

                "Failed to instantiate crypto object.");

                "Failed to instantiate crypto object: %s", strerr.c_str());

        return;

    }
@@ -295,7 +296,8 @@ static void android_media_MediaCrypto_setMediaDrmSession( 
        } else if (err == NO_INIT) {

            msg += ": crypto plugin not initialized";

        } else {

            msg.appendFormat(": general failure (%d)", err);

            std::string strerr(StrCryptoError(err));

            msg.appendFormat(": general failure (%s)", strerr.c_str());

        }

        jniThrowException(env, "android/media/MediaCryptoException", msg.string());

    }