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

Commit 452bc55c authored by Kyle Zhang's avatar Kyle Zhang
Browse files

Check NULL for Drm object 

Bug: 264629548
Test: CtsMediaDrmFrameworkTestCases
Change-Id: I1e9332898adc6a5268dfb107a2356d443e6f08ff
parent 688256e5

media/jni/android_media_MediaDrm.cpp

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




static jbyteArray android_media_MediaDrm_getSupportedCryptoSchemesNative(JNIEnv *env) {

static jbyteArray android_media_MediaDrm_getSupportedCryptoSchemesNative(JNIEnv *env) {

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

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

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



    std::vector<uint8_t> bv;

    std::vector<uint8_t> bv;

    drm->getSupportedSchemes(bv);

    drm->getSupportedSchemes(bv);



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

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

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

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

    return jUuidBytes;

    return jUuidBytes;