summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHawkwood Glazier <jglazier@google.com>2023-08-11 19:49:05 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-09-15 21:18:22 +0000
commitd45fe1600110fd3653196483fed77b828daa3cf0 (patch)
treed8c35fe6f270d1b0e7504a2f2785de45da404d55
parent562084ac0a60e5777f2b29cb7e8e463d9b1b88b9 (diff)
downloadbase-d45fe1600110fd3653196483fed77b828daa3cf0.tar.gz
Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached
Bug: 295143740 Bug: 293929945 Test: Manually checked codepath with secondary display (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dea88a049ba8eabe381b5a5318dd77b5aa1d186f) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c9c3e0f81a9c3037d06c7ffa8c66d08d74f0cf40) Merged-In: I8807d1d58b58f1e5c990c21cef6a810e8b13c1db Change-Id: I8807d1d58b58f1e5c990c21cef6a810e8b13c1db
-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);