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

Snap for 7925568 from 9067a53892 to tm-release

Browse Source 
Change-Id: Ia7556dad8535962273420ce54566646e4c174b28
This commit is contained in:
Android Build Coastguard Worker
2021-11-18 02:20:30 +00:00
parent e4d6d73bd9 9067a53892
commit 6b2b33be57
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/test/test_printers.cpp
View File

@@ -1192,7 +1192,10 @@ void PrintTo(const enum OEMCryptoResult& value, ::std::ostream* os) {
*os << "OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION"; *os << "OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION";
break; break;
case OEMCrypto_ERROR_NEEDS_KEYBOX_PROVISIONING: case OEMCrypto_ERROR_NEEDS_KEYBOX_PROVISIONING:
*os << "ERROR_NEEDS_KEYBOX_PROVISIONING"; *os << "NEEDS_KEYBOX_PROVISIONING";
break;
case OEMCrypto_ERROR_INVALID_KEY:
*os << "INVALID_KEY";
break; break;
// ODK Values. // ODK Values.
case ODK_ERROR_CORE_MESSAGE: case ODK_ERROR_CORE_MESSAGE:

2
libwvdrmengine/cdm/include/wv_android_constants.h
View File

@@ -9,7 +9,7 @@
namespace wvcdm { namespace wvcdm {
static const std::string kWVAndroidCdmVersion = "16.1.0"; static const std::string kWVAndroidCdmVersion = "17.0.0";
} // namespace wvcdm } // namespace wvcdm

3
libwvdrmengine/oemcrypto/odk/include/OEMCryptoCENCCommon.h
View File

@@ -61,7 +61,7 @@ typedef enum OEMCryptoResult {
OEMCrypto_ERROR_INVALID_NONCE = 32, OEMCrypto_ERROR_INVALID_NONCE = 32,
OEMCrypto_ERROR_TOO_MANY_KEYS = 33, OEMCrypto_ERROR_TOO_MANY_KEYS = 33,
OEMCrypto_ERROR_DEVICE_NOT_RSA_PROVISIONED = 34, OEMCrypto_ERROR_DEVICE_NOT_RSA_PROVISIONED = 34,
OEMCrypto_ERROR_INVALID_RSA_KEY = 35, OEMCrypto_ERROR_INVALID_RSA_KEY = 35, /* deprecated */
OEMCrypto_ERROR_KEY_EXPIRED = 36, OEMCrypto_ERROR_KEY_EXPIRED = 36,
OEMCrypto_ERROR_INSUFFICIENT_RESOURCES = 37, OEMCrypto_ERROR_INSUFFICIENT_RESOURCES = 37,
OEMCrypto_ERROR_INSUFFICIENT_HDCP = 38, OEMCrypto_ERROR_INSUFFICIENT_HDCP = 38,
@@ -89,6 +89,7 @@ typedef enum OEMCryptoResult {
OEMCrypto_WARNING_MIXED_OUTPUT_PROTECTION = 59, OEMCrypto_WARNING_MIXED_OUTPUT_PROTECTION = 59,
OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION = 60, OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION = 60,
OEMCrypto_ERROR_NEEDS_KEYBOX_PROVISIONING = 61, OEMCrypto_ERROR_NEEDS_KEYBOX_PROVISIONING = 61,
OEMCrypto_ERROR_INVALID_KEY = 65,
/* ODK return values */ /* ODK return values */
ODK_ERROR_BASE = 1000, ODK_ERROR_BASE = 1000,
ODK_ERROR_CORE_MESSAGE = ODK_ERROR_BASE, ODK_ERROR_CORE_MESSAGE = ODK_ERROR_BASE,