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

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

Merge "libmedia_jni requiresSecureDecoder: throw on error" into sc-dev am:... 

Merge "libmedia_jni requiresSecureDecoder: throw on error" into sc-dev am: 26cb27a9 am: 37b745b8

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

Change-Id: I3929cbafd6006df392dc37cfa4e2d310691eb570
parents e49a2fac 37b745b8

media/jni/android_media_MediaDrm.cpp

+9 −2
Original line number Diff line number Diff line
@@ -2002,10 +2002,17 @@ static jboolean android_media_MediaDrm_requiresSecureDecoder( 
        return JNI_FALSE;

    }



    bool required = false;

    status_t err = OK;

    if (securityLevel == DrmPlugin::kSecurityLevelMax) {

        return drm->requiresSecureDecoder(mimeType.c_str());

        err = drm->requiresSecureDecoder(mimeType.c_str(), &required);

    } else {

        err = drm->requiresSecureDecoder(mimeType.c_str(), securityLevel, &required);

    }

    if (throwExceptionAsNecessary(env, drm, err, "Failed to query secure decoder requirement")) {

        return false;

    }

    return drm->requiresSecureDecoder(mimeType.c_str(), securityLevel);

    return required;

}



static void android_media_MediaDrm_setPlaybackId(