commit 42fa9df38cf95d676d689bad37ab8f0a06aeecfa
author Hawkwood Glazier <jglazier@google.com> Tue Jun 28 19:29:51 2022 +0000
committer Hawkwood Glazier <jglazier@google.com> Tue Aug 02 02:01:16 2022 +0000
tree b33aa13e0283f5a8c1d2af1569f4bf29784211f7
parent 5f092e150a7ed1a40f52081c273ded8ec2d6c12d

Prevent NPE when displaying a missing clock

Test: Manual
Bug: 229771520
Fixes: 237255645
Change-Id: I17cddba7aee082c118f9f63eaab8a8c025daee73
(cherry picked from commit 2a4d9e5d51257cd43a10758e931990f582629b50)
Merged-In: I17cddba7aee082c118f9f63eaab8a8c025daee73

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
index d566f49..9b514d5 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
@@ -259,9 +259,10 @@
 
         mCurrentClockSize = clockSize;
 
+        Clock clock = getClock();
         boolean appeared = mView.switchToClock(clockSize, animate);
-        if (animate && appeared && clockSize == LARGE) {
-            getClock().getAnimations().enter();
+        if (clock != null && animate && appeared && clockSize == LARGE) {
+            clock.getAnimations().enter();
         }
     }