Merge "libmedia_jni requiresSecureDecoder: throw on error" into sc-dev (26cb27a9) · Commits · e / os / android_frameworks_base

media/jni/android_media_MediaDrm.cpp

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2002,10 +2002,17 @@ static jboolean android_media_MediaDrm_requiresSecureDecoder(
	return JNI_FALSE;		return JNI_FALSE;
	}		}

			bool required = false;
			status_t err = OK;
	if (securityLevel == DrmPlugin::kSecurityLevelMax) {		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);
			}
			if (throwExceptionAsNecessary(env, drm, err, "Failed to query secure decoder requirement")) {
			return false;
	}		}
	return drm->requiresSecureDecoder(mimeType.c_str(), securityLevel);		return required;
	}		}

	static void android_media_MediaDrm_setPlaybackId(		static void android_media_MediaDrm_setPlaybackId(