From 3f3563c3ae329b5e31c815f91138a2a61c0aa71d Mon Sep 17 00:00:00 2001
From: Govinda Wasserman <gwasserman@google.com>
Date: Tue, 10 Aug 2021 23:10:00 -0400
Subject: [PATCH] Fixes AssistOrbController crash

AssistOrbController caused a crash by trying to remove a view that was
not attached. This change adds a check if the view is attached before
removal.

Test: Tested locally
BUG: 195902117
FIX: 195902117
Change-Id: Ibc65a9b1789c7ee629c28de31392fffc0536ed70
---
 .../src/com/android/systemui/assist/AssistOrbController.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistOrbController.java b/packages/SystemUI/src/com/android/systemui/assist/AssistOrbController.java
index 81a13a236685a..408201558a9b6 100644
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistOrbController.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistOrbController.java
@@ -57,7 +57,9 @@ public class AssistOrbController {
         public void run() {
             mView.removeCallbacks(this);
             mView.show(false /* show */, true /* animate */, () -> {
-                mWindowManager.removeView(mView);
+                if (mView.isAttachedToWindow()) {
+                    mWindowManager.removeView(mView);
+                }
             });
         }
     };