Merge "Check NULL for Drm object"

2023-01-26 19:16:46 +00:00
parent 516a2f8815 452bc55c81
commit 849320e814
1 changed files with 2 additions and 1 deletions
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -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;