Provisioning 3.0: Changes to Provisioning and Service Certs.
[ Merge of http://go/wvgerrit/23360 ] Service Certificates are used in two places, provisioning and licensing. The service certificate code depended on a session_id to get and set the service certificate properties, but the session_id was not available in the provisioning path. This patch pulls out the property lookup by session_id dependency, and passes the CdmImpl's property_set into the provisioning code, so the service certificate can be read and written there. Bug: 62972441 Test: WV unit/integration tests. This introduces three test failures * WvCdmRequestLicenseTest.PrivacyModeWithServiceCertificateTest * Cdm/WvCdmStreamingLicenseRenewalTest.WithClientId/4 * Cdm/WvCdmOfflineLicenseReleaseTest.WithClientId/3 Change-Id: I6e9d4e23a9e7e81a63a994db8ec0b443893449a6
This commit is contained in:
@@ -212,7 +212,6 @@ enum {
|
||||
kInvalidParametersEng14 = ERROR_DRM_VENDOR_MIN + 199,
|
||||
kInvalidParametersEng15 = ERROR_DRM_VENDOR_MIN + 200,
|
||||
kInvalidParametersEng16 = ERROR_DRM_VENDOR_MIN + 201,
|
||||
kDeviceCertificateError5 = ERROR_DRM_VENDOR_MIN + 202,
|
||||
kCertProvisioningClientTokenError1 = ERROR_DRM_VENDOR_MIN + 203,
|
||||
kCertProvisioningClientTokenError2 = ERROR_DRM_VENDOR_MIN + 204,
|
||||
kLicensingClientTokenError1 = ERROR_DRM_VENDOR_MIN + 205,
|
||||
|
||||
@@ -81,8 +81,6 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
|
||||
return kDeviceCertificateError3;
|
||||
case wvcdm::DEVICE_CERTIFICATE_ERROR_4:
|
||||
return kDeviceCertificateError4;
|
||||
case wvcdm::DEVICE_CERTIFICATE_ERROR_5:
|
||||
return kDeviceCertificateError5;
|
||||
case wvcdm::EMPTY_KEY_DATA_1:
|
||||
return kEmptyKeyData1;
|
||||
case wvcdm::EMPTY_KEY_DATA_2:
|
||||
@@ -542,6 +540,7 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
|
||||
case wvcdm::UNUSED_4:
|
||||
case wvcdm::UNUSED_5:
|
||||
case wvcdm::UNUSED_6:
|
||||
case wvcdm::UNUSED_7:
|
||||
return android::UNKNOWN_ERROR;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user