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

Merge "Disable delayed termination on unprovisioning" into rvc-dev am: 587f488ac1 am: 20274578e5

Browse Source 
Change-Id: Ied36eb673947d3ab35a2abb4eccb4812ef948efe
This commit is contained in:
Automerger Merge Worker
2020-03-13 23:56:18 +00:00
parent c89e450f8b 20274578e5
commit 4d84d367da
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,6 +227,12 @@ CdmResponseType WvContentDecryptionModule::HandleProvisioningResponse(
CdmResponseType WvContentDecryptionModule::Unprovision( CdmResponseType WvContentDecryptionModule::Unprovision(
CdmSecurityLevel level, const CdmIdentifier& identifier) { CdmSecurityLevel level, const CdmIdentifier& identifier) {
CdmEngine* cdm_engine = EnsureCdmForIdentifier(identifier); CdmEngine* cdm_engine = EnsureCdmForIdentifier(identifier);
// Persistent state is deleted on unprovisioning. The L3 OEMCrypto device
// key may however remain in memory until |OEMCrypto_Terminate| is called.
// It is not regenerated until |OEMCrypto_Initialize| is called.
// Enable immediate OEMCrypto termination and re-initalization on
// unprovisioning.
CryptoSession::DisableDelayedTermination();
return cdm_engine->Unprovision(level); return cdm_engine->Unprovision(level);
} }