Merge "Fixes AssistOrbController crash" into sc-qpr1-dev am: c5f6c53cd8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15526390 Change-Id: I5e2e45355cfda341a5e842406b6ae6140d3c59aa
2021-08-12 17:28:38 +00:00
parent 6c62b172e3 c5f6c53cd8
commit 4d0632768e
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);
+                }
            });
        }
    };