Merge "Ensure view is attached to window before removing it" into sc-dev

2021-03-10 13:53:19 +00:00
parent 8b7a902791 dd278eba33
commit 943a2392a8
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -170,7 +170,9 @@ public class AssistManager {
                    boolean visible = false;
                    if (mView != null) {
                        visible = mView.isShowing();
-                        mWindowManager.removeView(mView);
+                        if (mView.isAttachedToWindow()) {
+                            mWindowManager.removeView(mView);
+                        }
                    }

                    mView = (AssistOrbContainer) LayoutInflater.from(mContext).inflate(