From 5bb242afe02900685d687dea7eaae0600d55bea6 Mon Sep 17 00:00:00 2001 From: Robert Shih Date: Wed, 28 Apr 2021 10:04:51 -0700 Subject: [PATCH] libmedia_jni requiresSecureDecoder: throw on error Bug: 164486735 Test: MediaDrmTest Change-Id: I2a062e6bd73630621fd022fcb0d640f812a7a8eb --- media/jni/android_media_MediaDrm.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index 4ccbfaf24c655..4f7b7115fe260 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -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(