am 6abed070: am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev

* commit '6abed0706be80764c4cffe46fcb8e01ec8d9be95':
  Fix wakelock leak for dozing

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

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