commit dba162a2349674da386e0f596f0593a5359e2e33
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Mar 09 03:14:47 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 09 03:14:47 2019 +0000
tree 3ab174ab6e461582659748e19473822733f04183
parent f017599f3a45302b988290fe09013cafbbce7776
parent 09f852769da61cb75a81848a44bb7a779d8b31c0

Merge "Avoid crashing when sensors are under stress"

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

diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
index 7656564..847182d 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
@@ -93,7 +93,13 @@
                 new DozeHost.PulseCallback() {
                     @Override
                     public void onPulseStarted() {
-                        mMachine.requestState(DozeMachine.State.DOZE_PULSING);
+                        try {
+                            mMachine.requestState(DozeMachine.State.DOZE_PULSING);
+                        } catch (IllegalStateException e) {
+                            // It's possible that the pulse was asynchronously cancelled while
+                            // we were waiting for it to start (under stress conditions.)
+                            // In those cases we should just ignore it. b/127657926
+                        }
                     }
 
                     @Override