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

Commit 4575acf1 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Fix bug in MediaCrypto.setMediaDrmSession" into mnc-dev

parents c52e0d90 025af8b0

media/jni/android_media_MediaCrypto.cpp

+12 −10
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ static void android_media_MediaCrypto_setMediaDrmSession( 


    status_t err = crypto->setMediaDrmSession(sessionId);



    if (err != OK) {

        String8 msg("setMediaDrmSession failed");

        if (err == ERROR_DRM_SESSION_NOT_OPENED) {

            msg += ": session not opened";
@@ -308,11 +309,12 @@ static void android_media_MediaCrypto_setMediaDrmSession( 
            msg += ": not supported by this crypto scheme";

        } else if (err == NO_INIT) {

            msg += ": crypto plugin not initialized";

    } else if (err != OK) {

        } else {

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

        }

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

    }

}



static JNINativeMethod gMethods[] = {

    { "release", "()V", (void *)android_media_MediaCrypto_release },