Merge "Fixes IllegalStateException caused by child already having parent"

2019-03-05 00:48:35 +00:00
parent 229ae4a46e d747025c74
commit 615f2602d5
1 changed files with 1 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
@@ -148,6 +148,7 @@ public class KeyguardClockSwitch extends RelativeLayout {
        Dependency.get(StatusBarStateController.class).removeCallback(mStateListener);
        Dependency.get(SysuiColorExtractor.class)
            .removeOnColorsChangedListener(mColorsListener);
+        setClockPlugin(null);
    }

    private void setClockPlugin(ClockPlugin plugin) {