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

Commit 849320e8 authored by Kyle Zhang's avatar Kyle Zhang Committed by Gerrit Code Review
Browse files

Merge "Check NULL for Drm object"

parents 516a2f88 452bc55c

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;