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

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

Merge "Only register the primary KeyguardClockSwitchController w/ DumpManager"... 

Merge "Only register the primary KeyguardClockSwitchController w/ DumpManager" into udc-qpr-dev am: 839f081b

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



Change-Id: I69c032112962873486cb8144ac97f1404e1a4e18
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 471dd6dd 839f081b

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

+4 −2
Original line number Diff line number Diff line
@@ -222,8 +222,10 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        mSmallClockFrame = mView.findViewById(R.id.lockscreen_clock_view);

        mLargeClockFrame = mView.findViewById(R.id.lockscreen_clock_view_large);



        if (!mOnlyClock) {

            mDumpManager.unregisterDumpable(getClass().toString()); // unregister previous clocks

            mDumpManager.registerDumpable(getClass().toString(), this);

        }



        if (mFeatureFlags.isEnabled(LOCKSCREEN_WALLPAPER_DREAM_ENABLED)) {

            mStatusArea = mView.findViewById(R.id.keyguard_status_area);