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

Commit 3dc4000a authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am b53960d5: am 285970cf: Merge "Fixed index out of bounds issue when removing... 

am b53960d5: am 285970cf: Merge "Fixed index out of bounds issue when removing windows." into lmp-mr1-dev automerge: 4937d95a

* commit 'b53960d5':
  Fixed index out of bounds issue when removing windows.
parents 3b54b6d7 b53960d5

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

+10 −4
Original line number Diff line number Diff line
@@ -252,11 +252,17 @@ class AppWindowToken extends WindowToken { 
        return false;

    }



    @Override

    void removeAllWindows() {

        for (int winNdx = allAppWindows.size() - 1; winNdx >= 0; --winNdx) {

            WindowState win = allAppWindows.get(winNdx);

            if (WindowManagerService.DEBUG_WINDOW_MOVEMENT) Slog.w(WindowManagerService.TAG,

                    "removeAllWindows: removing win=" + win);

        int winNdx;

        while ((winNdx = allAppWindows.size()) > 0) {

            WindowState win = allAppWindows.get(winNdx - 1);

            if (WindowManagerService.DEBUG_WINDOW_MOVEMENT) {

                Slog.w(WindowManagerService.TAG, "removeAllWindows: removing win=" + win);

            }



            // {@link WindowManagerService.removeWindowLocked} may remove multiple entries from

            // {@link #allAppWindows} if the window to be removed has child windows.

            win.mService.removeWindowLocked(win.mSession, win);

        }

    }