Merge "Prevent NPE when displaying a missing clock" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
4760b7cda3
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user