Merge "Doze: Fix WakeLock bug" (8068bfea) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -225,8 +225,10 @@ public class DozeMachine {
		boolean newPolicy = wakeLockPolicy(newState);
		if (mWakeLockHeldForCurrentState && !newPolicy) {
		mWakeLock.release();
		mWakeLockHeldForCurrentState = false;
		} else if (!mWakeLockHeldForCurrentState && newPolicy) {
		mWakeLock.acquire();
		mWakeLockHeldForCurrentState = true;
		}
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,19 @@ public class DozeMachineTest {
		assertFalse(mWakeLockFake.isHeld());
		}

		@Test
		@UiThreadTest
		public void testWakeLock_releasedAfterPulse() {
		mMachine.requestState(INITIALIZED);

		mMachine.requestState(DOZE);
		mMachine.requestState(DOZE_REQUEST_PULSE);
		mMachine.requestState(DOZE_PULSING);
		mMachine.requestState(DOZE_PULSE_DONE);

		assertFalse(mWakeLockFake.isHeld());
		}

		@Test
		@UiThreadTest
		public void testScreen_offInDoze() {