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

Revert "Sony Patch to LicenseKeys::GetAllowedUsage()"

Browse Source 
This reverts commit 7f16e103e6.

Reason for revert: Widevine has historically kept the Widevine and Android master branches in sync. But since the impact to Android is minimal, this change doesn't meet the bar for Android UDC-QPR2 or any other QPR. And in the new rolling release model, master(main) is now UDC-QPR2, so there's nowhere this code can be checked in on the Android side at this time. Reverting the original, premature sync of the change from the Widevine repo.

Change-Id: I4382750956cf7e472741760cef315f0871d5f4f5
This commit is contained in:
John Bruce
2023-05-25 19:00:20 +00:00
committed by Android (Google) Code Review
parent 7f16e103e6
commit 959982c2d1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/src/license_key_status.cpp
View File

@@ -130,7 +130,7 @@ bool LicenseKeys::GetAllowedUsage(const KeyId& key_id,
} else if (content_keyid_to_entitlement_key_id_.count(key_id) > 0) { } else if (content_keyid_to_entitlement_key_id_.count(key_id) > 0) {
if (key_statuses_.count(content_keyid_to_entitlement_key_id_[key_id]) > 0) { if (key_statuses_.count(content_keyid_to_entitlement_key_id_[key_id]) > 0) {
return key_statuses_[content_keyid_to_entitlement_key_id_[key_id]] return key_statuses_[content_keyid_to_entitlement_key_id_[key_id]]
->GetAllowedUsage(allowed_usage); ->CanDecryptContent();
} }
return false; return false;
} else { } else {