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

Merge "libmedia_jni requiresSecureDecoder: throw on error" into sc-dev

Browse Source
This commit is contained in:
Robert Shih
2021-04-30 21:52:31 +00:00
committed by Android (Google) Code Review
parent 627cac02ad 5bb242afe0
commit 26cb27a912
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/jni/android_media_MediaDrm.cpp
View File

@@ -2002,10 +2002,17 @@ static jboolean android_media_MediaDrm_requiresSecureDecoder(
return JNI_FALSE;
}
bool required = false;
status_t err = OK;
if (securityLevel == DrmPlugin::kSecurityLevelMax) {
return drm->requiresSecureDecoder(mimeType.c_str());
err = drm->requiresSecureDecoder(mimeType.c_str(), &required);
} else {
err = drm->requiresSecureDecoder(mimeType.c_str(), securityLevel, &required);
}
return drm->requiresSecureDecoder(mimeType.c_str(), securityLevel);
if (throwExceptionAsNecessary(env, drm, err, "Failed to query secure decoder requirement")) {
return false;
}
return required;
}
static void android_media_MediaDrm_setPlaybackId(