Merge "Fixes AssistOrbController crash" into sc-qpr1-dev

2021-08-12 17:26:10 +00:00
parent 235484b05f 3f3563c3ae
commit c5f6c53cd8
1 changed files with 3 additions and 1 deletions
--- 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);
+                }
            });
        }
    };