Merge latest oemcrypto-v17 change
No-Typo-Check: Not related to this change. Bug: 161477208 Change-Id: I99e4780f6855b7045aa0cd5a49c13d2d0d51ed64
This commit is contained in:
committed by
Fred Gylys-Colwell
parent
c924960962
commit
642965c678
@@ -946,6 +946,51 @@ void PrintTo(const enum CdmResponseType& value, ::std::ostream* os) {
|
||||
case PROVISIONING_NOT_ALLOWED_FOR_ATSC:
|
||||
*os << "PROVISIONING_NOT_ALLOWED_FOR_ATSC";
|
||||
break;
|
||||
case PROVISIONING_TYPE_IS_NOT_BOOT_CERTIFICATE_CHAIN_ERROR:
|
||||
*os << "PROVISIONING_TYPE_IS_NOT_BOOT_CERTIFICATE_CHAIN_ERROR";
|
||||
break;
|
||||
case GET_BOOT_CERTIFICATE_CHAIN_ERROR:
|
||||
*os << "GET_BOOT_CERTIFICATE_CHAIN_ERROR";
|
||||
break;
|
||||
case GENERATE_CERTIFICATE_KEY_PAIR_ERROR:
|
||||
*os << "GENERATE_CERTIFICATE_KEY_PAIR_ERROR";
|
||||
break;
|
||||
case GENERATE_CERTIFICATE_KEY_PAIR_UNKNOWN_TYPE_ERROR:
|
||||
*os << "GENERATE_CERTIFICATE_KEY_PAIR_ERROR";
|
||||
break;
|
||||
case LOAD_OEM_CERTIFICATE_PRIVATE_KEY_ERROR:
|
||||
*os << "GENERATE_CERTIFICATE_KEY_PAIR_ERROR";
|
||||
break;
|
||||
case PROVISIONING_4_CRYPTO_SESSION_NOT_OPEN:
|
||||
*os << "PROVISIONING_4_CRYPTO_SESSION_NOT_OPEN";
|
||||
break;
|
||||
case PROVISIONING_4_FILE_SYSTEM_IS_NULL:
|
||||
*os << "PROVISIONING_4_FILE_SYSTEM_IS_NULL";
|
||||
break;
|
||||
case PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES:
|
||||
*os << "PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES";
|
||||
break;
|
||||
case PROVISIONING_4_RESPONSE_FAILED_TO_PARSE_MESSAGE:
|
||||
*os << "PROVISIONING_4_RESPONSE_FAILED_TO_PARSE_MESSAGE";
|
||||
break;
|
||||
case PROVISIONING_4_RESPONSE_HAS_ERROR_STATUS:
|
||||
*os << "PROVISIONING_4_RESPONSE_HAS_ERROR_STATUS";
|
||||
break;
|
||||
case PROVISIONING_4_RESPONSE_HAS_NO_CERTIFICATE:
|
||||
*os << "PROVISIONING_4_RESPONSE_HAS_NO_CERTIFICATE";
|
||||
break;
|
||||
case PROVISIONING_4_NO_PRIVATE_KEY:
|
||||
*os << "PROVISIONING_4_NO_PRIVATE_KEY";
|
||||
break;
|
||||
case PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_2:
|
||||
*os << "PROVISIONING_4_FAILED_TO_INITIALIZE_DEVICE_FILES_2";
|
||||
break;
|
||||
case PROVISIONING_4_FAILED_TO_STORE_OEM_CERTIFICATE:
|
||||
*os << "PROVISIONING_4_FAILED_TO_STORE_OEM_CERTIFICATE";
|
||||
break;
|
||||
case PROVISIONING_4_FAILED_TO_STORE_DRM_CERTIFICATE:
|
||||
*os << "PROVISIONING_4_FAILED_TO_STORE_DRM_CERTIFICATE";
|
||||
break;
|
||||
default:
|
||||
*os << "Unknown CdmResponseType";
|
||||
break;
|
||||
@@ -1189,11 +1234,20 @@ void PrintTo(const enum OEMCryptoResult& value, ::std::ostream* os) {
|
||||
*os << "MIXED_OUTPUT_PROTECTION";
|
||||
break;
|
||||
case OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION:
|
||||
*os << "OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION";
|
||||
*os << "INVALID_ENTITLED_KEY_SESSION";
|
||||
break;
|
||||
case OEMCrypto_ERROR_NEEDS_KEYBOX_PROVISIONING:
|
||||
*os << "NEEDS_KEYBOX_PROVISIONING";
|
||||
break;
|
||||
case OEMCrypto_ERROR_UNSUPPORTED_CIPHER:
|
||||
*os << "OEMCrypto_ERROR_UNSUPPORTED_CIPHER";
|
||||
break;
|
||||
case OEMCrypto_ERROR_DVR_FORBIDDEN:
|
||||
*os << "OEMCrypto_ERROR_DVR_FORBIDDEN";
|
||||
break;
|
||||
case OEMCrypto_ERROR_INSUFFICIENT_PRIVILEGE:
|
||||
*os << "OEMCrypto_ERROR_INSUFFICIENT_PRIVILEGE";
|
||||
break;
|
||||
case OEMCrypto_ERROR_INVALID_KEY:
|
||||
*os << "INVALID_KEY";
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user