Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c11bab5b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I748dcc4a81da53fc5948215d386f498f344958fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79191fd3 31f6e65c

core/java/android/view/WindowManagerGlobal.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);