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"

Browse Source
This commit is contained in:
Hawkwood Glazier
2022-06-28 23:41:09 +00:00
committed by Android (Google) Code Review
parent 828bff7d95 2a4d9e5d51
commit 9c4811982f
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;
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();
}
}