widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert conditional tests using a logical AND operator.

Browse Source 
Merge from http://go/wvgerrit/27480.

Revert to the original test using a logical AND operator for
is_encrypted and !CanDecryptContent tests.

Test: GTS WidevineDashPolicyTests

bug: 34258607
Change-Id: If42698aa77f6f49a79dedb11a15d3055d6b76ef2
This commit is contained in:
Edwin Wong
2017-05-19 15:42:12 -07:00
parent da390f605a
commit 6c71aeaf95
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libwvdrmengine/cdm/core/src/cdm_session.cpp
View File

@@ -551,14 +551,13 @@ CdmResponseType CdmSession::Decrypt(const CdmDecryptionParameters& params) {
// Playback may not begin until either the start time passes or the license
// is updated, so we treat this Decrypt call as invalid.
if (params.is_encrypted) {
if (!policy_engine_->CanDecryptContent(*params.key_id)) {
if (policy_engine_->IsLicenseForFuture())
return DECRYPT_NOT_READY;
if (!policy_engine_->IsSufficientOutputProtection(*params.key_id))
return INSUFFICIENT_OUTPUT_PROTECTION;
return NEED_KEY;
}
if (params.is_encrypted &&
!policy_engine_->CanDecryptContent(*params.key_id)) {
if (policy_engine_->IsLicenseForFuture())
return DECRYPT_NOT_READY;
if (!policy_engine_->IsSufficientOutputProtection(*params.key_id))
return INSUFFICIENT_OUTPUT_PROTECTION;
return NEED_KEY;
}
CdmResponseType status = crypto_session_->Decrypt(params);