Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Doze: Fix WakeLock bug"

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-17 20:57:30 +00:00
committed by Android (Google) Code Review
parent 5bec219934 ae0c5e8d2c
commit 8068bfeae2
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
View File

@@ -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
packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
View File

@@ -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() {