Merge "Make sure to cleanup views that couldn't be added" into tm-qpr-dev

2022-07-12 20:42:06 +00:00
parent 1f147b4822 56ac2e2475
commit c01cce0313
1 changed files with 3 additions and 2 deletions
--- a/core/java/android/view/WindowManagerGlobal.java
+++ b/core/java/android/view/WindowManagerGlobal.java
@@ -404,9 +404,10 @@ public final class WindowManagerGlobal {
            try {
                root.setView(view, wparams, panelParentView, userId);
            } catch (RuntimeException e) {
+                final int viewIndex = findViewLocked(view, false);
                // BadTokenException or InvalidDisplayException, clean up.
-                if (index >= 0) {
-                    removeViewLocked(index, true);
+                if (viewIndex >= 0) {
+                    removeViewLocked(viewIndex, true);
                }
                throw e;
            }