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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-18 17:53:04 +00:00
committed by Android (Google) Code Review
parent e14a002e1e b1525b85e1
commit 31f6e65c85
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);