libmedia_jni requiresSecureDecoder: throw on error

Bug: 164486735
Test: MediaDrmTest
Change-Id: I2a062e6bd73630621fd022fcb0d640f812a7a8eb
This commit is contained in:
Robert Shih
2021-04-28 10:04:51 -07:00
parent f343ef3161
commit 5bb242afe0

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(