From c9c3e0f81a9c3037d06c7ffa8c66d08d74f0cf40 Mon Sep 17 00:00:00 2001
From: Hawkwood Glazier <jglazier@google.com>
Date: Fri, 11 Aug 2023 19:49:05 +0000
Subject: 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)
Merged-In: I8807d1d58b58f1e5c990c21cef6a810e8b13c1db
Change-Id: I8807d1d58b58f1e5c990c21cef6a810e8b13c1db
---
 .../SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java | 1 +
 1 file changed, 1 insertion(+)

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);
-- 
cgit v1.2.3-59-g8ed1b