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

Merge "Logging for L1 devices falling back to L3"

Browse Source
This commit is contained in:
Rahul Frias
2023-02-15 21:53:10 +00:00
committed by Android (Google) Code Review
parent b11890a694 ca583d9510
commit 04d136df36
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -926,9 +926,15 @@ class Adapter {
LOOKUP_ALL(18, SetMaxAPIVersion, OEMCrypto_SetMaxAPIVersion); LOOKUP_ALL(18, SetMaxAPIVersion, OEMCrypto_SetMaxAPIVersion);
if (level1_.Initialize == nullptr || level1_.APIVersion == nullptr || if (level1_.Initialize == nullptr || level1_.APIVersion == nullptr ||
level1_.Terminate == nullptr) { level1_.Terminate == nullptr) {
const char* kSucceeded = "succeeded";
const char* kFailed = "failed";
LOGW(
"Lookup for OEMCrypto_Initialize: %s, OEMCrypto_APIVersion: %s,"
" OEMCrypto_Terminate: %s",
level1_.Initialize == nullptr ? kFailed : kSucceeded,
level1_.APIVersion == nullptr ? kFailed : kSucceeded,
level1_.Terminate == nullptr ? kFailed : kSucceeded);
level1_valid_ = false; level1_valid_ = false;
}
if (!level1_valid_) {
metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode( metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_INVALID_L1); wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_INVALID_L1);
return false; return false;
@@ -940,9 +946,10 @@ class Adapter {
level1_.SetSandbox(&sandbox_id_[0], sandbox_id_.size()); level1_.SetSandbox(&sandbox_id_[0], sandbox_id_.size());
} }
} }
OEMCryptoResult st = level1_.Initialize(); level1_initialization_result_ = level1_.Initialize();
if (st != OEMCrypto_SUCCESS) { if (level1_initialization_result_ != OEMCrypto_SUCCESS) {
LOGW("Could not initialize L1. Falling back to L3."); LOGW("Could not initialize L1. Falling back to L3: %d",
static_cast<int>(level1_initialization_result_));
metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode( metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
wvcdm::metrics:: wvcdm::metrics::
OEMCrypto_INITIALIZED_USING_L3_COULD_NOT_INITIALIZE_L1); OEMCrypto_INITIALIZED_USING_L3_COULD_NOT_INITIALIZE_L1);
@@ -1317,7 +1324,11 @@ class Adapter {
if (!level1_valid_) { if (!level1_valid_) {
// TODO(b/189989043): add metrics. // TODO(b/189989043): add metrics.
// If level 1 not initialized, then return level 3's answer. // If level 1 not initialized, then return level 3's answer.
return OEMCrypto_ERROR_NOT_IMPLEMENTED; LOGE("L1 not initialized. Falling back to L3");
if (level1_initialization_result_ != OEMCrypto_SUCCESS)
return level1_initialization_result_;
else
return OEMCrypto_ERROR_NOT_IMPLEMENTED;
} }
// Figure out provisioning method. Defaults to keybox. // Figure out provisioning method. Defaults to keybox.
const OEMCrypto_ProvisioningMethod provisioning_method = const OEMCrypto_ProvisioningMethod provisioning_method =
@@ -1424,6 +1435,7 @@ class Adapter {
private: private:
bool level1_valid_ = false; bool level1_valid_ = false;
bool level1_initialized_ = false; bool level1_initialized_ = false;
OEMCryptoResult level1_initialization_result_ = OEMCrypto_SUCCESS;
// If the level 1 fails to initialize once, we don't try again. // If the level 1 fails to initialize once, we don't try again.
bool level1_failed_ = false; bool level1_failed_ = false;
void* level1_library_ = nullptr; void* level1_library_ = nullptr;