Merge "Don't release WakeLock w/o active client" into rvc-qpr-dev

This commit is contained in:
TreeHugger Robot
2021-01-20 19:57:20 +00:00
committed by Android (Google) Code Review

View File

@@ -33,7 +33,7 @@ public interface WakeLock {
static final String REASON_WRAP = "wrap"; static final String REASON_WRAP = "wrap";
/** /**
* Default wake-lock timeout, to avoid battery regressions. * Default wake-lock timeout in milliseconds, to avoid battery regressions.
*/ */
long DEFAULT_MAX_TIMEOUT = 20000; long DEFAULT_MAX_TIMEOUT = 20000;
@@ -104,6 +104,7 @@ public interface WakeLock {
if (count == null) { if (count == null) {
Log.wtf(TAG, "Releasing WakeLock with invalid reason: " + why, Log.wtf(TAG, "Releasing WakeLock with invalid reason: " + why,
new Throwable()); new Throwable());
return;
} else if (count == 1) { } else if (count == 1) {
mActiveClients.remove(why); mActiveClients.remove(why);
} else { } else {