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 am: c01cce0313

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19138536

Change-Id: I7d52c9d73afd051076c6f4516272f7464fa88352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-12 21:29:21 +00:00
committed by Automerger Merge Worker
parent 29c180410b c01cce0313
commit 4ab2bc56dd
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;
} }