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

Commit 82c40d5e authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am 8019b9d2: am c66cdf2c: am 70e67733: am e8246ff7: Merge "Fixed out of bounds... 

am 8019b9d2: am c66cdf2c: am 70e67733: am e8246ff7: Merge "Fixed out of bounds exception while handling app crash" into mnc-dev

* commit '8019b9d2':
  Fixed out of bounds exception while handling app crash
parents 32dfe1b7 8019b9d2

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -3205,10 +3205,10 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    void handleAppCrashLocked(ProcessRecord app) {

    void handleAppCrashLocked(ProcessRecord app) {

        for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {

        for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {

            final ArrayList<ActivityStack> stacks = mActivityDisplays.valueAt(displayNdx).mStacks;

            final ArrayList<ActivityStack> stacks = mActivityDisplays.valueAt(displayNdx).mStacks;

            final int numStacks = stacks.size();

            int stackNdx = stacks.size() - 1;

            for (int stackNdx = 0; stackNdx < numStacks; ++stackNdx) {

            while (stackNdx >= 0) {

                final ActivityStack stack = stacks.get(stackNdx);

                stacks.get(stackNdx).handleAppCrashLocked(app);

                stack.handleAppCrashLocked(app);

                stackNdx--;

            }

            }

        }

        }

    }

    }