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

Merge latest oemcrypto-v17 change

Browse Source 
No-Typo-Check: Not related to this change.

Bug: 161477208
Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
This commit is contained in:
Kyle Zhang
2022-01-21 05:58:12 +00:00
committed by Fred Gylys-Colwell
parent c924960962
commit 642965c678
176 changed files with 301013 additions and 296749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libwvdrmengine/include_hidl/mapErrors-inl.h
View File

@@ -364,6 +364,21 @@ static Status mapCdmResponseType_1_0(wvcdm::CdmResponseType res) {
case wvcdm::USAGE_ENTRY_ALREADY_LOADED:
case wvcdm::PARSE_OKP_RESPONSE_ERROR:
case wvcdm::OKP_ALREADY_PROVISIONED:
case wvcdm::PROVISIONING_TYPE_IS_NOT_BOOT_CERTIFICATE_CHAIN_ERROR:
case wvcdm::GET_BOOT_CERTIFICATE_CHAIN_ERROR:
case wvcdm::GENERATE_CERTIFICATE_KEY_PAIR_ERROR:
case wvcdm::GENERATE_CERTIFICATE_KEY_PAIR_UNKNOWN_TYPE_ERROR:
case wvcdm::LOAD_OEM_CERTIFICATE_PRIVATE_KEY_ERROR:
case wvcdm::PROVISIONING_4_CRYPTO_SESSION_NOT_OPEN:
case wvcdm::PROVISIONING_4_FILE_SYSTEM_IS_NULL:
case wvcdm::PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES:
case wvcdm::PROVISIONING_4_RESPONSE_FAILED_TO_PARSE_MESSAGE:
case wvcdm::PROVISIONING_4_RESPONSE_HAS_ERROR_STATUS:
case wvcdm::PROVISIONING_4_RESPONSE_HAS_NO_CERTIFICATE:
case wvcdm::PROVISIONING_4_NO_PRIVATE_KEY:
case wvcdm::PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_2:
case wvcdm::PROVISIONING_4_FAILED_TO_STORE_OEM_CERTIFICATE:
case wvcdm::PROVISIONING_4_FAILED_TO_STORE_DRM_CERTIFICATE:
ALOGW("Returns UNKNOWN error for legacy status: %d", res);
return Status::ERROR_DRM_UNKNOWN;
@@ -453,6 +468,7 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
break;
case wvcdm::CANNOT_DECRYPT_ZERO_SAMPLES:
case wvcdm::CERT_PROVISIONING_REQUEST_ERROR_1:
case wvcdm::CLIENT_TOKEN_NOT_SET:
case wvcdm::CRYPTO_SESSION_NOT_INITIALIZED:
case wvcdm::CRYPTO_SESSION_NOT_OPEN:
case wvcdm::DEVICE_CANNOT_REPROVISION:
@@ -461,6 +477,9 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::EMPTY_KEYSET_ID_ENG_5:
case wvcdm::EMPTY_RESPONSE_ERROR_1:
case wvcdm::EMPTY_SESSION_ID:
case wvcdm::GENERATE_CERTIFICATE_KEY_PAIR_ERROR:
case wvcdm::GENERATE_CERTIFICATE_KEY_PAIR_UNKNOWN_TYPE_ERROR:
case wvcdm::GET_BOOT_CERTIFICATE_CHAIN_ERROR:
case wvcdm::INCORRECT_USAGE_SUPPORT_TYPE_1:
case wvcdm::INCORRECT_USAGE_SUPPORT_TYPE_2:
case wvcdm::INVALID_IV_SIZE:
@@ -490,6 +509,7 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::LICENSE_REQUEST_SERVICE_CERTIFICATE_GENERATION_ERROR:
case wvcdm::LICENSE_USAGE_ENTRY_MISSING:
case wvcdm::LOAD_ENTITLED_CONTENT_KEYS_ERROR:
case wvcdm::LOAD_OEM_CERTIFICATE_PRIVATE_KEY_ERROR:
case wvcdm::LOAD_USAGE_ENTRY_GENERATION_SKEW:
case wvcdm::LOAD_USAGE_ENTRY_INVALID_SESSION:
case wvcdm::LOAD_USAGE_ENTRY_SIGNATURE_FAILURE:
@@ -505,6 +525,11 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::PARAMETER_NULL:
case wvcdm::PREPARE_CENC_CONTENT_ID_FAILED:
case wvcdm::PREPARE_WEBM_CONTENT_ID_FAILED:
case wvcdm::PROVISIONING_4_CRYPTO_SESSION_NOT_OPEN:
case wvcdm::PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES:
case wvcdm::PROVISIONING_4_FILE_SYSTEM_IS_NULL:
case wvcdm::PROVISIONING_4_NO_PRIVATE_KEY:
case wvcdm::PROVISIONING_TYPE_IS_NOT_BOOT_CERTIFICATE_CHAIN_ERROR:
case wvcdm::REINIT_ERROR:
case wvcdm::REMOVE_OFFLINE_LICENSE_ERROR_2:
case wvcdm::REMOVE_USAGE_INFO_ERROR_3:
@@ -525,7 +550,6 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::USAGE_INVALID_PARAMETERS_1:
case wvcdm::USAGE_INVALID_PARAMETERS_2:
case wvcdm::USAGE_STORE_ENTRY_RETRIEVE_INVALID_STORAGE_TYPE:
case wvcdm::CLIENT_TOKEN_NOT_SET:
err = ::drm::V1_4::Status::GENERAL_PLUGIN_ERROR;
break;
case wvcdm::CLIENT_ID_GENERATE_RANDOM_ERROR:
@@ -587,6 +611,7 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::NO_CONTENT_KEY:
case wvcdm::NO_CONTENT_KEY_2:
case wvcdm::NO_DEVICE_KEY_1:
case wvcdm::PROVISIONING_4_RESPONSE_FAILED_TO_PARSE_MESSAGE:
case wvcdm::REFRESH_KEYS_ERROR:
case wvcdm::SESSION_KEYS_NOT_FOUND:
case wvcdm::SIGNATURE_NOT_FOUND:
@@ -646,6 +671,7 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
err = ::drm::V1_4::Status::PROVISIONING_CERTIFICATE_ERROR;
break;
case wvcdm::CERT_PROVISIONING_EMPTY_SERVICE_CERTIFICATE:
case wvcdm::PROVISIONING_4_RESPONSE_HAS_NO_CERTIFICATE:
case wvcdm::SERVICE_CERTIFICATE_PROVIDER_ID_EMPTY:
err = ::drm::V1_4::Status::PROVISIONING_CONFIGURATION_ERROR;
break;
@@ -659,6 +685,7 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
err = ::drm::V1_4::Status::PROVISIONING_PARSE_ERROR;
break;
case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_10:
case wvcdm::PROVISIONING_4_RESPONSE_HAS_ERROR_STATUS:
err = ::drm::V1_4::Status::PROVISIONING_REQUEST_REJECTED;
break;
case wvcdm::EMPTY_PROVISIONING_CERTIFICATE_1:
@@ -695,6 +722,9 @@ static S mapCdmResponseType(wvcdm::CdmResponseType res) {
case wvcdm::CERT_PROVISIONING_RESPONSE_ERROR_8:
case wvcdm::DELETE_USAGE_ERROR_1:
case wvcdm::DELETE_USAGE_ERROR_2:
case wvcdm::PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_2:
case wvcdm::PROVISIONING_4_FAILED_TO_STORE_DRM_CERTIFICATE:
case wvcdm::PROVISIONING_4_FAILED_TO_STORE_OEM_CERTIFICATE:
case wvcdm::RELEASE_KEY_REQUEST_ERROR:
case wvcdm::REMOVE_ALL_USAGE_INFO_ERROR_5:
case wvcdm::REMOVE_USAGE_INFO_ERROR_1: