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

Change-Id: If416900f9bf30a9c71adb14dd71711805b19dc0e

libwvdrmengine/cdm/src/wv_content_decryption_module.cpp

@@ -227,6 +227,12 @@ CdmResponseType WvContentDecryptionModule::HandleProvisioningResponse(
 CdmResponseType WvContentDecryptionModule::Unprovision(
     CdmSecurityLevel level, const CdmIdentifier& 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);
 }