Change watchdog timer to 2 minutes
Merge from Widevine repo of http://go/wvgerrit/35480 This relaxes the watchdog timer around the level 3 oemcrypto initialization to 120 seconds. There are also a couple of new log messages at the end of initialization and at termination. Library for arm updated: level3/arm/libwvlevel3.a Level3 Library 4445 Oct 4 2017 17:06:25 bug: 65379279 Test: unit tests on n5. View netflix on Nexus 5. GTS tests on N5. Change-Id: Id474d6728da557051801d2ca92987496672b896a
This commit is contained in:
@@ -494,7 +494,7 @@ class WatchDog {
|
||||
pthread_mutex_lock(&mutex_);
|
||||
struct timespec time_to_giveup;
|
||||
clock_gettime(CLOCK_REALTIME, &time_to_giveup);
|
||||
time_to_giveup.tv_sec += 5; // wait 5 seconds.
|
||||
time_to_giveup.tv_sec += 120; // wait 2 minutes.
|
||||
if (running_) {
|
||||
pthread_cond_timedwait(&condition_, &mutex_, &time_to_giveup);
|
||||
}
|
||||
@@ -609,6 +609,7 @@ class Adapter {
|
||||
wvcdm::metrics::OEMCrypto_INITIALIZED_FORCING_L3);
|
||||
return result;
|
||||
}
|
||||
LOGI("L3 Initialized. Trying L1.");
|
||||
std::string library_name;
|
||||
if (!wvcdm::Properties::GetOEMCryptoPath(&library_name)) {
|
||||
LOGW("L1 library not specified. Falling back to L3");
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user