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

Merge "Handle SPOID calculation for L3" into rvc-dev am: 25d1646138 am: dffadd204c am: 61f64a00c6 am: 1b6f50a467

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/11736137

Change-Id: Iba9cfe403e14249910d5ba19a3ec4c238d7c09cd
This commit is contained in:
Rahul Frias
2020-06-22 18:46:13 +00:00
committed by Automerger Merge Worker
parent 2c03b461e0 1b6f50a467
commit 992d54d912
5 changed files with 470 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/include/wv_content_decryption_module.h
View File

@@ -99,6 +99,9 @@ class WvContentDecryptionModule : public android::RefBase, public TimerHandler {
virtual CdmResponseType Unprovision(CdmSecurityLevel level,
const CdmIdentifier& identifier);
virtual bool IsProvisioned(CdmSecurityLevel level, const std::string& origin,
const std::string& spoid, bool atsc_mode_enabled);
// Secure stop related methods
virtual CdmResponseType GetUsageInfo(const std::string& app_id,
const CdmIdentifier& identifier,

12
libwvdrmengine/cdm/src/wv_content_decryption_module.cpp
View File

@@ -240,6 +240,18 @@ CdmResponseType WvContentDecryptionModule::Unprovision(
return cdm_engine->Unprovision(level);
}
bool WvContentDecryptionModule::IsProvisioned(CdmSecurityLevel security_level,
const std::string& origin,
const std::string& spoid,
bool atsc_mode_enabled) {
FileSystem file_system;
file_system.set_origin(origin);
file_system.set_identifier(spoid + origin);
DeviceFiles device_files(&file_system);
device_files.Init(security_level);
return device_files.HasCertificate(atsc_mode_enabled);
}
CdmResponseType WvContentDecryptionModule::GetUsageInfo(
const std::string& app_id, const CdmIdentifier& identifier,
CdmUsageInfo* usage_info) {