Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-12 20:42:06 +00:00
committed by Android (Google) Code Review
parent 1f147b4822 56ac2e2475
commit c01cce0313
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/WindowManagerGlobal.java
View File

@@ -404,9 +404,10 @@ public final class WindowManagerGlobal {
try { try {
root.setView(view, wparams, panelParentView, userId); root.setView(view, wparams, panelParentView, userId);
} catch (RuntimeException e) { } catch (RuntimeException e) {
final int viewIndex = findViewLocked(view, false);
// BadTokenException or InvalidDisplayException, clean up. // BadTokenException or InvalidDisplayException, clean up.
if (index >= 0) { if (viewIndex >= 0) {
removeViewLocked(index, true); removeViewLocked(viewIndex, true);
} }
throw e; throw e;
} }