Merge "Prevent double animation of lockicon when waking."

packages/SystemUI/plugin/src/com/android/systemui/plugins/statusbar/StatusBarStateController.java

@@ -39,6 +39,12 @@ public interface StatusBarStateController {
      */
     boolean isDozing();
 
+
+    /**
+     * Is device pulsing.
+     */
+    boolean isPulsing();
+
     /**
      * Adds a state listener
      */

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarStateControllerImpl.java

@@ -177,6 +177,11 @@ public class StatusBarStateControllerImpl implements SysuiStatusBarStateControll
         return mIsDozing;
     }
 
+    @Override
+    public boolean isPulsing() {
+        return mPulsing;
+    }
+
     @Override
     public float getDozeAmount() {
         return mDozeAmount;

packages/SystemUI/src/com/android/systemui/statusbar/phone/DozeServiceHost.java

@@ -214,7 +214,6 @@ public final class DozeServiceHost implements DozeHost {
             dozing = false;
         }
 
-
         mStatusBarStateController.setIsDozing(dozing);
     }
 

packages/SystemUI/src/com/android/systemui/statusbar/phone/LockscreenLockIconController.java

@@ -76,7 +76,6 @@ public class LockscreenLockIconController {
     private boolean mKeyguardShowing;
     private boolean mKeyguardJustShown;
     private boolean mBlockUpdates;
-    private boolean mDozing;
     private boolean mSimLocked;
     private boolean mTransientBiometricsError;
     private boolean mDocked;
@@ -452,7 +451,8 @@ public class LockscreenLockIconController {
             shouldUpdate = false;
         }
         if (shouldUpdate && mLockIcon != null) {
-            mLockIcon.update(state, mDozing, mKeyguardJustShown);
+            mLockIcon.update(state,
+                    mStatusBarStateController.isDozing(), mKeyguardJustShown);
         }
         mLastState = state;
         mKeyguardJustShown = false;
@@ -480,7 +480,6 @@ public class LockscreenLockIconController {
     }
 
     private void setDozing(boolean isDozing) {
-        mDozing = isDozing;
         update();
     }
 
@@ -495,7 +494,7 @@ public class LockscreenLockIconController {
      * @return true if the visibility changed
      */
     private boolean updateIconVisibility() {
-        boolean onAodOrDocked = mDozing || mDocked;
+        boolean onAodOrDocked = mStatusBarStateController.isDozing() && mDocked;
         boolean invisible = onAodOrDocked || mWakeAndUnlockRunning || mShowingLaunchAffordance;
         if (mKeyguardBypassController.getBypassEnabled() && !mBouncerShowingScrimmed) {
             if ((mHeadsUpManagerPhone.isHeadsUpGoingAway()