commit 615f2602d50beb933dbb25f2c196ae830d247964
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 05 00:48:35 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 05 00:48:35 2019 +0000
tree 259d21d2854ad681c3b25b38c892febeedd84129
parent 229ae4a46e2bbabac52b82c80e54def1a919d8c8
parent d747025c7437258a169987845f86a0e1489bd130

Merge "Fixes IllegalStateException caused by child already having parent"

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
index 563b007..507c822 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java
@@ -148,6 +148,7 @@
         Dependency.get(StatusBarStateController.class).removeCallback(mStateListener);
         Dependency.get(SysuiColorExtractor.class)
             .removeOnColorsChangedListener(mColorsListener);
+        setClockPlugin(null);
     }
 
     private void setClockPlugin(ClockPlugin plugin) {