Merge "Prevent NPE when displaying a missing clock" into tm-qpr-dev

This commit is contained in:
Hawkwood Glazier
2022-08-02 21:59:50 +00:00
committed by Android (Google) Code Review

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();
}
}