Merge "Don't release WakeLock w/o active client" (601ec923) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/util/wakelock/WakeLock.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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 {