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

Merge "Don't try to open non-existant file"

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2018-01-19 19:33:06 +00:00
committed by Android (Google) Code Review
parent 07ce4f5a55 4c7e6ca78b
commit f8d114ad11
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -714,8 +714,16 @@ class Adapter {
return false; return false;
} }
ssize_t size = file_system.FileSize(filename); ssize_t size = file_system.FileSize(filename);
if (size <= 0) {
LOGW("Could not find %s. Falling Back to L3.", filename.c_str());
level1_.Terminate();
metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(
wvcdm::metrics::
OEMCrypto_INITIALIZED_USING_L3_COULD_NOT_OPEN_FACTORY_KEYBOX);
return false;
}
wvcdm::File* file = file_system.Open(filename, file_system.kReadOnly); wvcdm::File* file = file_system.Open(filename, file_system.kReadOnly);
if (size <= 0 || !file) { if (!file) {
LOGW("Could not open %s. Falling Back to L3.", filename.c_str()); LOGW("Could not open %s. Falling Back to L3.", filename.c_str());
level1_.Terminate(); level1_.Terminate();
metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode( metrics->OemCryptoDynamicAdapterMetrics::SetInitializationMode(