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

Merge "Check NULL for Drm object"

Browse Source
This commit is contained in:
Kyle Zhang
2023-01-26 19:16:46 +00:00
committed by Gerrit Code Review
parent 516a2f8815 452bc55c81
commit 849320e814
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;