From 2e6e7a3c11e1a763a673a95fe5942ab17cc95434 Mon Sep 17 00:00:00 2001
From: Dan Sandler <dsandler@android.com>
Date: Wed, 15 Sep 2021 21:49:36 -0400
Subject: [PATCH] Ensure callbacks removed when view detached.

Fixes: 193414087
Test: atest SystemUITests
Test: examine heap dumps for SysuiStatusBarStateController$RankedListener instances
Change-Id: I052c823b266449208424322457adcfdb483a278d
---
 .../src/com/android/keyguard/AnimatableClockController.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
index 92f89d6b90fd1..efcf40a662582 100644
--- a/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
+++ b/packages/SystemUI/src/com/android/keyguard/AnimatableClockController.java
@@ -160,9 +160,7 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
         mBroadcastDispatcher.unregisterReceiver(mLocaleBroadcastReceiver);
         mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateMonitorCallback);
         mBatteryController.removeCallback(mBatteryCallback);
-        if (!mView.isAttachedToWindow()) {
-            mStatusBarStateController.removeCallback(mStatusBarStatePersistentListener);
-        }
+        mStatusBarStateController.removeCallback(mStatusBarStatePersistentListener);
     }
 
     /** Animate the clock appearance */