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

Commit 4b85ee23 authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "Check NULL for Drm object" into tm-qpr-dev am: caff03cd am: 19038532 

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



Change-Id: Iab3482746a4f97ca46f3d84669794b4b9c65be10
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a543c29 19038532

media/jni/android_media_MediaDrm.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1021,9 +1021,10 @@ DrmPlugin::SecurityLevel jintToSecurityLevel(jint jlevel) { 


static jbyteArray android_media_MediaDrm_getSupportedCryptoSchemesNative(JNIEnv *env) {

    sp<IDrm> drm = android::DrmUtils::MakeDrm();

    if (drm == NULL) return env->NewByteArray(0);



    std::vector<uint8_t> bv;

    drm->getSupportedSchemes(bv);



    jbyteArray jUuidBytes = env->NewByteArray(bv.size());

    env->SetByteArrayRegion(jUuidBytes, 0, bv.size(), reinterpret_cast<const jbyte *>(bv.data()));

    return jUuidBytes;