commit 452bc55c81c58a2230106026a703d96b63deebbf
author Kyle Zhang <kelzhan@google.com> Mon Jan 23 22:37:45 2023 +0000
committer Kyle Zhang <kelzhan@google.com> Tue Jan 24 23:51:20 2023 +0000
tree f8ce96d95760fe0e3813933fba1a7d00ba61b73c
parent 688256e5d743b4ffc9c175d1d3febc200e63f6dc

Check NULL for Drm object

Bug: 264629548
Test: CtsMediaDrmFrameworkTestCases
Change-Id: I1e9332898adc6a5268dfb107a2356d443e6f08ff

media/jni/android_media_MediaDrm.cpp

diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp
index 681d76a..b70818d 100644
--- a/media/jni/android_media_MediaDrm.cpp
+++ b/media/jni/android_media_MediaDrm.cpp
@@ -1021,9 +1021,10 @@
 
 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;