From dd278eba33e2137df06e9223978244199fdb941b Mon Sep 17 00:00:00 2001
From: Matt Casey <mrcasey@google.com>
Date: Tue, 9 Mar 2021 13:28:30 -0500
Subject: [PATCH] Ensure view is attached to window before removing it

I'm not able to reproduce the bug, but we can avoid calling removeView
if the view isn't attached.

Bug: 180114844
Test: Manual verification of existing behavior
Change-Id: I1173f7d3656aaa10815f07717c09d3a3869d9878
---
 .../src/com/android/systemui/assist/AssistManager.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
index e85cafaf47acb..d3168c8d2a05c 100644
--- 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(