Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Prevent NPE when displaying a missing clock" into tm-qpr-dev am: 4760b7cda3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19492509

Change-Id: I686aea4e3916024ddabc81878195bd00539f4451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hawkwood Glazier
2022-08-02 22:20:49 +00:00
committed by Automerger Merge Worker
parent 9a751c1647 4760b7cda3
commit 5277665692
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
View File

@@ -263,9 +263,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
mCurrentClockSize = clockSize; mCurrentClockSize = clockSize;
Clock clock = getClock();
boolean appeared = mView.switchToClock(clockSize, animate); boolean appeared = mView.switchToClock(clockSize, animate);
if (animate && appeared && clockSize == LARGE) { if (clock != null && animate && appeared && clockSize == LARGE) {
getClock().getAnimations().enter(); clock.getAnimations().enter();
} }
} }