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

Commit 2c2a0ace authored by Robert Shih's avatar Robert Shih Committed by Automerger Merge Worker
Browse files

Merge "MediaDrm: detailed Exception messages continued" into sc-dev am: 35dd3d13 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cf08ec543b686b366c60c87a540f5c5dd9c5db6
parents e6a05a0c 35dd3d13

media/jni/android_media_MediaDrm.cpp

+4 −3
Original line number Diff line number Diff line
@@ -445,8 +445,7 @@ static bool throwExceptionAsNecessary( 
        jniThrowException(env, "android/media/DeniedByServerException", msg);

        return true;

    } else if (err == DEAD_OBJECT) {

        jniThrowException(env, "android/media/MediaDrmResetException",

                "mediaserver died");

        jniThrowException(env, "android/media/MediaDrmResetException", msg);

        return true;

    } else if (isSessionException(err)) {

        throwSessionException(env, msg, err);
@@ -967,10 +966,12 @@ static void android_media_MediaDrm_native_setup( 
    status_t err = drm->initCheck();



    if (err != OK) {

        auto logs(DrmUtils::gLogBuf.getLogs());

        auto msg(DrmUtils::GetExceptionMessage(err, "Failed to instantiate drm object", logs));

        jniThrowException(

                env,

                "android/media/UnsupportedSchemeException",

                "Failed to instantiate drm object.");

                msg.c_str());

        return;

    }