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

Revert "Use aidl interface for Widevine service."

Browse Source 
This reverts commit 96a8ccd4a1.

Reason for revert:
Could break DeviceManifest/SingleManifestTest#ManifestAidlHalsServed

Bug: 200055138
Bug: 170964303
Bug: 217241995
Change-Id: I9c42df15defec428c9ef8c62439c63d4a603fee6
This commit is contained in:
Yohei Yukawa
2022-01-31 22:01:25 +00:00
parent 96a8ccd4a1
commit a4d835af3a
75 changed files with 1480 additions and 7078 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,7 @@ CdmResponseType WvContentDecryptionModule::GenerateKeyRequest(
cdm_by_session_id_[key_set_id] = cdm_engine;
}
const wvcdm::RequestedSecurityLevel requested_security_level =
const SecurityLevel requested_security_level =
property_set && property_set->security_level().compare(
wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3) == 0
? wvcdm::kLevel3
@@ -181,8 +181,7 @@ CdmResponseType WvContentDecryptionModule::RemoveKeys(
}
CdmResponseType WvContentDecryptionModule::QueryStatus(
RequestedSecurityLevel security_level, const std::string& key,
std::string* value) {
SecurityLevel security_level, const std::string& key, std::string* value) {
CdmEngine* cdm_engine = EnsureCdmForIdentifier(kDefaultCdmIdentifier);
return cdm_engine->QueryStatus(security_level, key, value);
}
@@ -218,8 +217,8 @@ bool WvContentDecryptionModule::IsSecurityLevelSupported(
CdmResponseType WvContentDecryptionModule::GetProvisioningRequest(
CdmCertificateType cert_type, const std::string& cert_authority,
const CdmIdentifier& identifier, const std::string& service_certificate,
RequestedSecurityLevel requested_security_level,
CdmProvisioningRequest* request, std::string* default_url) {
SecurityLevel requested_security_level, CdmProvisioningRequest* request,
std::string* default_url) {
CdmEngine* cdm_engine = EnsureCdmForIdentifier(identifier);
return cdm_engine->GetProvisioningRequest(
cert_type, cert_authority, service_certificate, requested_security_level,
@@ -228,7 +227,7 @@ CdmResponseType WvContentDecryptionModule::GetProvisioningRequest(
CdmResponseType WvContentDecryptionModule::HandleProvisioningResponse(
const CdmIdentifier& identifier, CdmProvisioningResponse& response,
RequestedSecurityLevel requested_security_level, std::string* cert,
SecurityLevel requested_security_level, std::string* cert,
std::string* wrapped_key) {
CdmEngine* cdm_engine = EnsureCdmForIdentifier(identifier);
return cdm_engine->HandleProvisioningResponse(