Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check NULL for Drm object" am: 849320e814

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2401079

Change-Id: I1db05b3d7941b0d8296025cadc2d7dd2dc17549b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kyle Zhang
2023-01-27 20:31:32 +00:00
committed by Automerger Merge Worker
parent 19ea10dfd5 849320e814
commit 8b8a0a5f36
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/jni/android_media_MediaDrm.cpp
View File

@@ -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;