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 am: 4ab2bc56dd

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

Change-Id: If88b8ed5576720850fd341054ebb32af98878af4
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:32:05 +00:00
committed by Automerger Merge Worker
parent 0e27f4c248 4ab2bc56dd
commit 9106c2f805
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 {
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;
}