From 42fa9df38cf95d676d689bad37ab8f0a06aeecfa Mon Sep 17 00:00:00 2001
From: Hawkwood Glazier <jglazier@google.com>
Date: Tue, 28 Jun 2022 19:29:51 +0000
Subject: [PATCH] Prevent NPE when displaying a missing clock

Test: Manual
Bug: 229771520
Fixes: 237255645
Change-Id: I17cddba7aee082c118f9f63eaab8a8c025daee73
(cherry picked from commit 2a4d9e5d51257cd43a10758e931990f582629b50)
Merged-In: I17cddba7aee082c118f9f63eaab8a8c025daee73
---
 .../com/android/keyguard/KeyguardClockSwitchController.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
index d566f49c04ff9..9b514d50abe60 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
@@ -259,9 +259,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
 
         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();
         }
     }