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

Commit fa12978f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Fixed indexOutOfBoundsException in WindowManager"

parents 8285e5da b3847d8e

services/core/java/com/android/server/wm/WindowToken.java

+5 −5
Original line number Diff line number Diff line
@@ -631,8 +631,8 @@ class WindowToken { 
                final int privateFlags = wallpaperTarget.mAttrs.privateFlags;

                if (((privateFlags & PRIVATE_FLAG_KEYGUARD) != 0 || type == TYPE_KEYGUARD_SCRIM)

                        && !mService.isKeyguardAnimatingIn()) {

                    insertionIndex = Math.min(windows.indexOf(wallpaperTarget),

                            findLowestWindowOnScreen(windows));

                    insertionIndex = Math.min(windowList.indexOf(wallpaperTarget),

                            findLowestWindowOnScreen(windowList));

                }

            }

            if (DEBUG_WALLPAPER_LIGHT || DEBUG_WINDOW_MOVEMENT
@@ -651,10 +651,10 @@ class WindowToken { 
     * @return The index in {@param windows} of the lowest window that is currently on screen and

     *         not hidden by the policy.

     */

    private int findLowestWindowOnScreen(WindowList windows) {

        final int size = windows.size();

    private int findLowestWindowOnScreen(WindowList windowList) {

        final int size = windowList.size();

        for (int index = 0; index < size; index++) {

            final WindowState win = windows.get(index);

            final WindowState win = windowList.get(index);

            if (win.isOnScreen()) {

                return index;

            }