commit 5269a01c6d47b3a37736d9b30f24e091710ff064
author Winson Chung <winsonc@google.com> Tue May 06 23:46:00 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 06 23:46:00 2014 +0000
tree ea3390ab06f4d2026a940f8f5e8e328232cd4a2e
parent 8547e7022e8557614871ca5de340abed5b8fe761
parent 3aeaebb6fc2093069a138d0c8562020dfc76ad43

Merge "Fixing regression in calculating which activities to apply recents values to."

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index f908de2..cbb8377 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -7070,7 +7070,8 @@
                     final ArrayList<ActivityRecord> activities = tr.mActivities;
                     int activityNdx;
                     final int numActivities = activities.size();
-                    for (activityNdx = 0; activityNdx < numActivities; ++activityNdx) {
+                    for (activityNdx = Math.min(numActivities, 1); activityNdx < numActivities;
+                            ++activityNdx) {
                         final ActivityRecord r = activities.get(activityNdx);
                         if (r.intent != null &&
                                 (r.intent.getFlags() & Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET)