From 1d4339d0df6564d8054741c6cc96e0a2c2b97466 Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Wed, 19 Aug 2015 13:31:57 -0700 Subject: [PATCH] Do Not Clean Up Licenses As Aggressively (This is a merge of http://go/wvgerrit/15430) Previously, after provisioning, any existing offline licenses would be deleted, as they were inevitably tied to the certificate that was just replaced. However, due to the way per-origin provisioning works on Android, this is no longer a safe assumption. Licenses from different origins are all stored together, so this behavior would delete all offline licenses across all origins every time any origin is provisioned. And it is not possible to delete only the licenses for specific origins without changing how licenses are stored. It is too late to change how licenses are stored in Android M, so we need to stop proactively cleaning up licenses in this edge case for now. Once b/23354606 is resolved, we can reinstate this clean-up and properly only clean up the licenses associated with the origin that was just provisioned. Bug: 23324167 Change-Id: Ic21db8c21bdb4243266cd49020ed52287eb21d9a --- libwvdrmengine/cdm/core/src/certificate_provisioning.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp index 6779965d..515d1986 100644 --- a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp +++ b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp @@ -268,7 +268,6 @@ CdmResponseType CertificateProvisioning::HandleProvisioningResponse( LOGE("HandleProvisioningResponse: failed to save provisioning certificate"); return CERT_PROVISIONING_RESPONSE_ERROR_8; } - handle.DeleteAllLicenses(); return NO_ERROR; }