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

Commit 7dafc74f authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "[ActivityManager] Fix IndexOutOfBoundsException" am: a6151572 

am: 6c8b91d8

* commit '6c8b91d8':
  [ActivityManager] Fix IndexOutOfBoundsException
parents ff20c28c 6c8b91d8

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

+1 −2
Original line number Diff line number Diff line
@@ -2675,8 +2675,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        boolean didSomething = false;

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

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

            final int numStacks = stacks.size();

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

            for (int stackNdx = stacks.size() - 1; stackNdx >= 0; --stackNdx) {

                final ActivityStack stack = stacks.get(stackNdx);

                if (stack.finishDisabledPackageActivitiesLocked(

                        packageName, filterByClasses, doit, evenPersistent, userId)) {