Snap for 7045433 from 53d6db47e5 to sc-release

Change-Id: Ia13958601c9b02bc3acfe74d5dbd630a9b0baa89
This commit is contained in:
android-build-team Robot
2020-12-22 02:10:11 +00:00

View File

@@ -740,11 +740,16 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParametersV16& params) {
if (is_protected) {
if (!policy_engine_->CanDecryptContent(params.key_id)) {
if (policy_engine_->IsLicenseForFuture()) return DECRYPT_NOT_READY;
if (!policy_engine_->IsSufficientOutputProtection(params.key_id))
if (!policy_engine_->IsSufficientOutputProtection(params.key_id)) {
LOGE("Key use prohibited as HDCP or resolution requirements not met");
return INSUFFICIENT_OUTPUT_PROTECTION;
}
return NEED_KEY;
}
if (!policy_engine_->CanUseKeyForSecurityLevel(params.key_id)) {
LOGE(
"Key use prohibited as security level requirements in the policy"
" not met");
return KEY_PROHIBITED_FOR_SECURITY_LEVEL;
}
}