Merge "Ensure callbacks removed when view detached." into sc-qpr1-dev

This commit is contained in:
TreeHugger Robot
2021-09-17 01:25:48 +00:00
committed by Android (Google) Code Review

View File

@@ -160,10 +160,8 @@ public class AnimatableClockController extends ViewController<AnimatableClockVie
mBroadcastDispatcher.unregisterReceiver(mLocaleBroadcastReceiver); mBroadcastDispatcher.unregisterReceiver(mLocaleBroadcastReceiver);
mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateMonitorCallback); mKeyguardUpdateMonitor.removeCallback(mKeyguardUpdateMonitorCallback);
mBatteryController.removeCallback(mBatteryCallback); mBatteryController.removeCallback(mBatteryCallback);
if (!mView.isAttachedToWindow()) {
mStatusBarStateController.removeCallback(mStatusBarStatePersistentListener); mStatusBarStateController.removeCallback(mStatusBarStatePersistentListener);
} }
}
/** Animate the clock appearance */ /** Animate the clock appearance */
public void animateAppear() { public void animateAppear() {