Merge "[ActivityManager] Fix index OOB when updating visible."

2015-06-18 14:38:20 +00:00
parent b77bc86924 3fe52da421
commit ce7dba6bdf
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1258,6 +1258,10 @@ final class ActivityStack {
                        }
                        if (r != starting) {
                            mStackSupervisor.startSpecificActivityLocked(r, false, false);
+                            if (activityNdx >= activities.size()) {
+                                // Record may be removed if its process needs to restart.
+                                activityNdx = activities.size() - 1;
+                            }
                        }

                    } else if (r.visible) {