Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52776656 authored by Hawkwood Glazier's avatar Hawkwood Glazier Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I686aea4e3916024ddabc81878195bd00539f4451
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a751c16 4760b7cd

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+3 −2
Original line number Diff line number Diff line
@@ -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();

        }

    }