Prevent NPE when displaying a missing clock
Test: Manual
Bug: 229771520
Fixes: 237255645
Change-Id: I17cddba7aee082c118f9f63eaab8a8c025daee73
(cherry picked from commit 2a4d9e5d51)
Merged-In: I17cddba7aee082c118f9f63eaab8a8c025daee73
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user