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

Merge "Remove view based on known index of the view on exception" into tm-qpr-dev am: 31f6e65c85

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

Change-Id: I748dcc4a81da53fc5948215d386f498f344958fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-07-18 18:02:22 +00:00
committed by Automerger Merge Worker
parent 79191fd357 31f6e65c85
commit c11bab5bbe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,7 +404,7 @@ 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); final int viewIndex = (index >= 0) ? index : (mViews.size() - 1);
// BadTokenException or InvalidDisplayException, clean up. // BadTokenException or InvalidDisplayException, clean up.
if (viewIndex >= 0) { if (viewIndex >= 0) {
removeViewLocked(viewIndex, true); removeViewLocked(viewIndex, true);