diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/doze/DozeService.java | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java index a60b4e7..630d735 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeService.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeService.java @@ -256,6 +256,8 @@ public class DozeService extends DreamService { private void continuePulsing(int reason) { if (mHost.isPulsingBlocked()) { + mPulsing = false; + mWakeLock.release(); return; } mHost.pulseWhileDozing(new DozeHost.PulseCallback() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java index 4d3e57e..3ff69c9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeScrimController.java @@ -104,13 +104,11 @@ public class DozeScrimController { * Aborts pulsing immediately. */ public void abortPulsing() { - mHandler.removeCallbacks(mPulseIn); - abortAnimations(); + cancelPulsing(); if (mDozing) { mScrimController.setDozeBehindAlpha(1f); mScrimController.setDozeInFrontAlpha(1f); } - mPulseCallback = null; } public void onScreenTurnedOn() { |