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

Remove namespace from Level3 aliases

Browse Source 
Since the L3 functions are meant to alias the OEMCrypto functions,
they shouldn't appear in a namespace.

Change-Id: I8d11279ff86c5b5c9eab0598d134f6904f0021ad
This commit is contained in:
Jacob Trimble
2023-12-14 22:21:25 +00:00
committed by Robert Shih
parent 955c89315e
commit c5d06cb7c7
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

@@ -598,33 +598,32 @@ class WatchDog {
} else if (metrics != nullptr) {
// Even if we succeeded in calling initialize, there might be failures
// in the initialize process that we want to record.
wvoec3::Level3InitializationState state =
Level3_GetInitializationState();
Level3InitializationState state = Level3_GetInitializationState();
switch (state) {
case wvoec3::LEVEL3_INITIALIZATION_UNKNOWN_FAILURE:
case LEVEL3_INITIALIZATION_UNKNOWN_FAILURE:
metrics
->OemCryptoDynamicAdapterMetrics::SetLevel3InitializationError(
wvcdm::metrics::
OEMCrypto_INITIALIZED_L3_INITIALIZATION_FAILED);
break;
case wvoec3::LEVEL3_SEED_FAILURE:
case LEVEL3_SEED_FAILURE:
metrics
->OemCryptoDynamicAdapterMetrics::SetLevel3InitializationError(
wvcdm::metrics::OEMCrypto_INITIALIZED_L3_RNG_FAILED);
break;
case wvoec3::LEVEL3_SAVE_DEVICE_KEYS_FAILURE:
case LEVEL3_SAVE_DEVICE_KEYS_FAILURE:
metrics
->OemCryptoDynamicAdapterMetrics::SetLevel3InitializationError(
wvcdm::metrics::
OEMCrypto_INITIALIZED_L3_SAVE_DEVICE_KEYS_FAILED);
break;
case wvoec3::LEVEL3_READ_DEVICE_KEYS_FAILURE:
case LEVEL3_READ_DEVICE_KEYS_FAILURE:
metrics
->OemCryptoDynamicAdapterMetrics::SetLevel3InitializationError(
wvcdm::metrics::
OEMCrypto_INITIALIZED_L3_READ_DEVICE_KEYS_FAILED);
break;
case wvoec3::LEVEL3_VERIFY_DEVICE_KEYS_FAILURE:
case LEVEL3_VERIFY_DEVICE_KEYS_FAILURE:
metrics
->OemCryptoDynamicAdapterMetrics::SetLevel3InitializationError(
wvcdm::metrics::