summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2023-09-14 04:09:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-14 04:09:09 +0000
commit2522307949d95dc7b050a3941882965a43aa9506 (patch)
treea838423f604ac787ec97696386bf7b108cfd09c6
parent3544563bd1c9b32bdfa1bbd357896c00e36219b9 (diff)
parent18ffecdaf9413497856294fec50abac98be66728 (diff)
Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev am: fe4e586e2e am: 18ffecdaf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24422641 Change-Id: Idbb0841a92e0ee454bb03f2c47a389639fd9c8c1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
index a0261309d61a..70849b7e2acf 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
@@ -266,6 +266,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
setClock(null);
mSecureSettings.unregisterContentObserver(mDoubleLineClockObserver);
+ mSecureSettings.unregisterContentObserver(mShowWeatherObserver);
mKeyguardUnlockAnimationController.removeKeyguardUnlockAnimationListener(
mKeyguardUnlockAnimationListener);