Merge "[ActivityManager] Fix IndexOutOfBoundsException"

am: a61515720a

* commit 'a61515720ab95f6aa307c1fa4337c5c2078bad26':
  [ActivityManager] Fix IndexOutOfBoundsException
This commit is contained in:
Wale Ogunwale
2015-10-27 15:19:56 +00:00
committed by android-build-merger

View File

@@ -2670,8 +2670,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)) {