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

Commit 42fa9df3 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Prevent NPE when displaying a missing clock 

Test: Manual
Bug: 229771520
Fixes: 237255645
Change-Id: I17cddba7aee082c118f9f63eaab8a8c025daee73
(cherry picked from commit 2a4d9e5d)
Merged-In: I17cddba7aee082c118f9f63eaab8a8c025daee73
parent 5f092e15

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -259,9 +259,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 




        mCurrentClockSize = clockSize;

        mCurrentClockSize = clockSize;





        Clock clock = getClock();

        boolean appeared = mView.switchToClock(clockSize, animate);

        boolean appeared = mView.switchToClock(clockSize, animate);

        if (animate && appeared && clockSize == LARGE) {

        if (clock != null && animate && appeared && clockSize == LARGE) {

            getClock().getAnimations().enter();

            clock.getAnimations().enter();

        }

        }

    }

    }