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

Snap for 4557233 from f8d114ad11 to pi-release

Browse Source 
Change-Id: I99c2233a8b310d9277b9b6e059bc9c69d279d873
This commit is contained in:
android-build-team Robot
2018-01-21 08:26:48 +00:00
parent 68b8b3b7e9 f8d114ad11
commit 7dd5f01e71
5 changed files with 15 additions and 3 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(

1
libwvdrmengine/level3/mips/Android.mk
View File

@@ -4,6 +4,7 @@ LOCAL_CFLAGS := \
-DDYNAMIC_ADAPTER \ -DDYNAMIC_ADAPTER \
-Wno-unused -Wno-unused
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/include \
vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \
vendor/widevine/libwvdrmengine/level3/include \ vendor/widevine/libwvdrmengine/level3/include \
vendor/widevine/libwvdrmengine/oemcrypto/include vendor/widevine/libwvdrmengine/oemcrypto/include

1
libwvdrmengine/level3/mips64/Android.mk
View File

@@ -4,6 +4,7 @@ LOCAL_CFLAGS := \
-DDYNAMIC_ADAPTER \ -DDYNAMIC_ADAPTER \
-Wno-unused -Wno-unused
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/include \
vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \
vendor/widevine/libwvdrmengine/level3/include \ vendor/widevine/libwvdrmengine/level3/include \
vendor/widevine/libwvdrmengine/oemcrypto/include vendor/widevine/libwvdrmengine/oemcrypto/include

1
libwvdrmengine/level3/x86/Android.mk
View File

@@ -4,6 +4,7 @@ LOCAL_CFLAGS := \
-DDYNAMIC_ADAPTER \ -DDYNAMIC_ADAPTER \
-Wno-unused -Wno-unused
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/include \
vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \
vendor/widevine/libwvdrmengine/level3/include \ vendor/widevine/libwvdrmengine/level3/include \
vendor/widevine/libwvdrmengine/oemcrypto/include vendor/widevine/libwvdrmengine/oemcrypto/include

1
libwvdrmengine/level3/x86_64/Android.mk
View File

@@ -4,6 +4,7 @@ LOCAL_CFLAGS := \
-DDYNAMIC_ADAPTER \ -DDYNAMIC_ADAPTER \
-Wno-unused -Wno-unused
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/core/include \
vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \
vendor/widevine/libwvdrmengine/level3/include \ vendor/widevine/libwvdrmengine/level3/include \
vendor/widevine/libwvdrmengine/oemcrypto/include vendor/widevine/libwvdrmengine/oemcrypto/include