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

2014-05-06 15:44:36 -07:00
parent 26ebd62b57
commit 3aeaebb6fc
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -7070,7 +7070,8 @@ public final class ActivityManagerService extends ActivityManagerNative
                    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)