| commit | a1b19a2c39d177c3b013042b27004cebf87046ea | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Sat Dec 17 00:06:57 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Dec 17 00:07:02 2016 +0000 |
| tree | 66a2e282610cf0ce442fdce42ec1852a02044e06 | |
| parent | 2f042c923c20f8d065521bdb34b932ef9fc925c6 [diff] | |
| parent | cd139a6df1c098e7fc65abe6516d70519ebc568a [diff] |
Merge "Doze: Fix crash when suppressing pulse"
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java index 13e047c..6a868d5 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
@@ -218,7 +218,8 @@ Preconditions.checkState(mState == State.DOZE_REQUEST_PULSE); break; case DOZE_PULSE_DONE: - Preconditions.checkState(mState == State.DOZE_PULSING); + Preconditions.checkState( + mState == State.DOZE_REQUEST_PULSE || mState == State.DOZE_PULSING); break; default: break;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java index 8b99d72..c3948258 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
@@ -214,6 +214,16 @@ @Test @UiThreadTest + public void testSuppressingPulse_doesntCrash() { + mMachine.requestState(INITIALIZED); + + mMachine.requestState(DOZE); + mMachine.requestState(DOZE_REQUEST_PULSE); + mMachine.requestState(DOZE_PULSE_DONE); + } + + @Test + @UiThreadTest public void testScreen_offInDoze() { mMachine.requestState(INITIALIZED);