Merge "Ensure callbacks removed when view detached." into sc-qpr1-dev am: 209aec5829 am: d8fc342d04 am: 8fc90a41e0

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

Change-Id: If7c11946ee90b006761d6ad150c048de5f3fe3f1
This commit is contained in:
TreeHugger Robot
2021-09-17 01:59:51 +00:00
committed by Automerger Merge Worker

View File

@@ -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 */