From 452bc55c81c58a2230106026a703d96b63deebbf Mon Sep 17 00:00:00 2001
From: Kyle Zhang <kelzhan@google.com>
Date: Mon, 23 Jan 2023 22:37:45 +0000
Subject: [PATCH] Check NULL for Drm object

Bug: 264629548
Test: CtsMediaDrmFrameworkTestCases
Change-Id: I1e9332898adc6a5268dfb107a2356d443e6f08ff
---
 media/jni/android_media_MediaDrm.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 681d76ab0dfee..b70818d1e1b0a 100644
--- 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;