Merge "libwvhidl: map errors to PROVISIONING_REQUEST_REJECTED" into sc-dev

This commit is contained in:
Robert Shih
2021-03-07 06:01:18 +00:00
committed by Android (Google) Code Review

View File

@@ -652,11 +652,9 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::LOAD_PROVISIONING_ERROR: case wvcdm::LOAD_PROVISIONING_ERROR:
err = ::drm::V1_4::Status::PROVISIONING_PARSE_ERROR; err = ::drm::V1_4::Status::PROVISIONING_PARSE_ERROR;
break; break;
/* TODO (b/180579631): Uncomment when DRM Status type
* PROVISIONING_REQUEST_REJECTED has been created
case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_10: case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_10:
err = ::drm::V1_4::Status::PROVISIONING_REQUEST_REJECTED; err = ::drm::V1_4::Status::PROVISIONING_REQUEST_REJECTED;
*/ break;
case wvcdm::EMPTY_PROVISIONING_CERTIFICATE_1: case wvcdm::EMPTY_PROVISIONING_CERTIFICATE_1:
case wvcdm::EMPTY_PROVISIONING_CERTIFICATE_2: case wvcdm::EMPTY_PROVISIONING_CERTIFICATE_2:
err = ::drm::V1_4::Status::RETRYABLE_PROVISIONING_ERROR; err = ::drm::V1_4::Status::RETRYABLE_PROVISIONING_ERROR;