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

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

Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is... 

Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-qpr-dev am: 9a3027b9 am: 82acc015

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



Change-Id: I42f001e42544bfd1dc969bed981308a0000efcf7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1cb3bc7d 82acc015

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -293,6 +293,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
        setClock(null);

        setClock(null);





        mSecureSettings.unregisterContentObserver(mDoubleLineClockObserver);

        mSecureSettings.unregisterContentObserver(mDoubleLineClockObserver);

        mSecureSettings.unregisterContentObserver(mShowWeatherObserver);





        mKeyguardUnlockAnimationController.removeKeyguardUnlockAnimationListener(

        mKeyguardUnlockAnimationController.removeKeyguardUnlockAnimationListener(

                mKeyguardUnlockAnimationListener);

                mKeyguardUnlockAnimationListener);