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

Commit 8b8a0a5f authored by Kyle Zhang's avatar Kyle Zhang Committed by Automerger Merge Worker
Browse files

Merge "Check NULL for Drm object" am: 849320e8 

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



Change-Id: I1db05b3d7941b0d8296025cadc2d7dd2dc17549b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 19ea10df 849320e8

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;