From 346acd492077d03937a00261f6744df86c2fcd98 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 21 Jul 2021 10:49:41 -0400
Subject: [PATCH] Rely on the dozeAmount changes for mIsDozing

The large clock view can be attached while the
doze transition is happening, so we don't want to
mistakently set mIsDozing=false from StatusBarStateController#isDozing
when we should be relying on the update from onDozeAmountChanged.

Test: manual
Fixes: 194277812
Change-Id: I202b9d845194f9d97d8ac1d6d1ff7e3f78491fd7
---
 .../src/com/android/keyguard/AnimatableClockController.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
index c89cda98c8a54..92f89d6b90fd1 100644
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
@@ -133,12 +133,16 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
         }
     };
 
+    @Override
+    protected void onInit() {
+        mIsDozing = mStatusBarStateController.isDozing();
+    }
+
     @Override
     protected void onViewAttached() {
         updateLocale();
         mBroadcastDispatcher.registerReceiver(mLocaleBroadcastReceiver,
                 new IntentFilter(Intent.ACTION_LOCALE_CHANGED));
-        mIsDozing = mStatusBarStateController.isDozing();
         mDozeAmount = mStatusBarStateController.getDozeAmount();
         mBatteryController.addCallback(mBatteryCallback);
         mKeyguardUpdateMonitor.registerCallback(mKeyguardUpdateMonitorCallback);