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

Fix spurious wake up in dynamic adapter am: 5ccb147bb8 am: 6f9245c7ff

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/22686796

Change-Id: I773cfe69e1cd3aa5e63aeb2d957ecfd06afb70bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cong Lin
2023-04-20 23:05:07 +00:00
committed by Automerger Merge Worker
parent f97e8dd55d 6f9245c7ff
commit 36a07f8686
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -532,7 +532,10 @@ class WatchDog {
{ {
std::unique_lock<std::mutex> lock(mutex_); std::unique_lock<std::mutex> lock(mutex_);
if (running_) { if (running_) {
condition_.wait_for(lock, std::chrono::minutes(2)); if (!condition_.wait_for(lock, std::chrono::minutes(2),
[this]() { return !running_; })) {
LOGE("Level3 initialization timed out");
}
} }
if (running_) { if (running_) {
gave_up_ = true; gave_up_ = true;
@@ -857,7 +860,8 @@ class Adapter {
for (auto& name : library_names) { for (auto& name : library_names) {
level1_library_ = dlopen((name.c_str()), RTLD_NOW); level1_library_ = dlopen((name.c_str()), RTLD_NOW);
if (!level1_library_) { if (!level1_library_) {
LOGW("Could not load oemcrypto from path %s. %s", name.c_str(), dlerror()); LOGW("Could not load oemcrypto from path %s. %s", name.c_str(),
dlerror());
} }
} }
if (!level1_library_) { if (!level1_library_) {