commit 5d424061eadcad72c8c5bde4b55b15da2dc93e50
author Lucas Dupin <dupin@google.com> Fri Mar 08 23:22:01 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 08 23:22:01 2019 +0000
tree c07ed73a3936368f4315e2127d9e944a2990d732
parent a81b6c946003605b434d34c9c3fb373479ce3ec5
parent dc04d616cc66d180ad9e34629278b4f34b4f8c8f

Merge "Revert "Avoid NPE under stress conditions""

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 c3d4b0f..7656564 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeUi.java
@@ -39,7 +39,6 @@
  */
 public class DozeUi implements DozeMachine.Part {
 
-    private static final String TAG = "DozeUi";
     private static final long TIME_TICK_DEADLINE_MILLIS = 90 * 1000; // 1.5min
     private final Context mContext;
     private final DozeHost mHost;
@@ -94,10 +93,6 @@
                 new DozeHost.PulseCallback() {
                     @Override
                     public void onPulseStarted() {
-                        if (mMachine.getState() != DozeMachine.State.DOZE_REQUEST_PULSE) {
-                            Log.w(TAG, "Pulse was cancelled before it could have been started");
-                            return;
-                        }
                         mMachine.requestState(DozeMachine.State.DOZE_PULSING);
                     }