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

Report disable analog output error

Browse Source 
[ Merge of http://go/wvgerrit/23061 ]

b/34131127

Test: All unittests other than some oemcrypto, request_license_test
passed. Those tests failed with or without this CL.

Change-Id: I27a3cde8e5c86dc8f9b26f9d4e7793f86c016743
This commit is contained in:
Rahul Frias
2017-01-23 17:12:47 -08:00
parent 6a98f56412
commit 0c4b8572cd
7 changed files with 80 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libwvdrmengine/include/WVErrors.h
View File

@@ -205,10 +205,10 @@ enum {
kKeyNotFound4 = ERROR_DRM_VENDOR_MIN + 191,
kKeyNotFound5 = ERROR_DRM_VENDOR_MIN + 192,
kKeyNotFound6 = ERROR_DRM_VENDOR_MIN + 193,
kKeyError1 = ERROR_DRM_VENDOR_MIN + 194,
kKeyError2 = ERROR_DRM_VENDOR_MIN + 195,
kKeyError3 = ERROR_DRM_VENDOR_MIN + 196,
kKeyError4 = ERROR_DRM_VENDOR_MIN + 197,
kInvalidSession1 = ERROR_DRM_VENDOR_MIN + 194,
kNoDeviceKey1 = ERROR_DRM_VENDOR_MIN + 195,
kNoContentKey2 = ERROR_DRM_VENDOR_MIN + 196,
kInsufficientCryptoResources2 = ERROR_DRM_VENDOR_MIN + 197,
kInvalidParametersEng13 = ERROR_DRM_VENDOR_MIN + 198,
kInvalidParametersEng14 = ERROR_DRM_VENDOR_MIN + 199,
kInvalidParametersEng15 = ERROR_DRM_VENDOR_MIN + 200,
@@ -217,9 +217,11 @@ enum {
kCertProvisioningClientTokenError1 = ERROR_DRM_VENDOR_MIN + 203,
kCertProvisioningClientTokenError2 = ERROR_DRM_VENDOR_MIN + 204,
kLicensingClientTokenError1 = ERROR_DRM_VENDOR_MIN + 205,
kUnknownSelectKeyError1 = ERROR_DRM_VENDOR_MIN + 206,
kUnknownSelectKeyError2 = ERROR_DRM_VENDOR_MIN + 207,
// This should always follow the last error code.
// The offset value should be updated each time a new error code is added.
kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 205,
kErrorWVDrmMaxErrorUsed = ERROR_DRM_VENDOR_MIN + 207,
// Used by crypto test mode
kErrorTestMode = ERROR_DRM_VENDOR_MAX,

22
libwvdrmengine/include/mapErrors-inl.h
View File

@@ -374,10 +374,10 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::UNKNOWN_ERROR:
return android::ERROR_DRM_UNKNOWN;
case wvcdm::SECURE_BUFFER_REQUIRED:
return android::ERROR_DRM_CANNOT_HANDLE;
case wvcdm::DECRYPT_ERROR:
return android::ERROR_DRM_CANNOT_HANDLE;
case wvcdm::INSUFFICIENT_OUTPUT_PROTECTION:
case wvcdm::ANALOG_OUTPUT_ERROR:
return android::ERROR_DRM_INSUFFICIENT_OUTPUT_PROTECTION;
case wvcdm::SESSION_NOT_FOUND_12:
return kSessionNotFound12;
@@ -403,14 +403,14 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kKeyNotFound5;
case wvcdm::KEY_NOT_FOUND_6:
return kKeyNotFound6;
case wvcdm::KEY_ERROR_1:
return kKeyError1;
case wvcdm::KEY_ERROR_2:
return kKeyError2;
case wvcdm::KEY_ERROR_3:
return kKeyError3;
case wvcdm::KEY_ERROR_4:
return kKeyError4;
case wvcdm::INVALID_SESSION_1:
return kInvalidSession1;
case wvcdm::NO_DEVICE_KEY_1:
return kNoDeviceKey1;
case wvcdm::NO_CONTENT_KEY_2:
return kNoContentKey2;
case wvcdm::INSUFFICIENT_CRYPTO_RESOURCES_2:
return kInsufficientCryptoResources2;
case wvcdm::INVALID_PARAMETERS_ENG_13:
return kInvalidParametersEng13;
case wvcdm::INVALID_PARAMETERS_ENG_14:
@@ -425,6 +425,10 @@ static android::status_t mapCdmResponseType(wvcdm::CdmResponseType res) {
return kCertProvisioningClientTokenError2;
case wvcdm::LICENSING_CLIENT_TOKEN_ERROR_1:
return kLicensingClientTokenError1;
case wvcdm::UNKNOWN_SELECT_KEY_ERROR_1:
return kUnknownSelectKeyError1;
case wvcdm::UNKNOWN_SELECT_KEY_ERROR_2:
return kUnknownSelectKeyError2;
case wvcdm::UNUSED_1:
case wvcdm::UNUSED_2:
case wvcdm::UNUSED_3: