From 3fe52da421abba355a51b8b5c6dd2ca073383c18 Mon Sep 17 00:00:00 2001 From: riddle_hsu Date: Fri, 5 Jun 2015 16:38:38 +0800 Subject: [PATCH] [ActivityManager] Fix index OOB when updating visible. If there is an Activity Z of Task T needs be visible but isn't running, and the process P of Z is existed, it will just to schedule launch Z. The problem will happen when P is died (e.g. kill itself) right before scheduleLaunchActivity. Once RemoteException is caught, startSpecificActivityLocked will try to restart the process and run cleanup procedure because the process record is existed (death recipient of P has not entered AMS yet). And assume task T contains X, Y, Z. X and Y have declared stateNotNeeded=true, so X and Y will be removed from task T. Now the size of task T changes from 3 to 1. And because activityNdx=2 when updating Z, the next round (--activityNdx) will have exception at activities.get(activityNdx): IndexOutOfBoundsException: Invalid index 1, size is 1 The ActivityRecord in TaskRecord is removed by below flow: ActivityStack.ensureActivitiesVisibleLocked ActivityStackSupervisor.startSpecificActivityLocked ActivityStackSupervisor.realStartActivityLocked ApplicationThreadProxy.scheduleLaunchActivity -> IPC fail ActivityManagerService.startProcessLocked ActivityManagerService.handleAppDiedLocked ActivityStackSupervisor.handleAppDiedLocked ActivityStack.handleAppDiedLocked ActivityStack.removeHistoryRecordsForAppLocked ActivityStack.removeActivityFromHistoryLocked task.removeActivity(r) -> mActivities.remove(r) There is also similar patch to solve the same problem: https://android-review.googlesource.com/143780/ Change-Id: Iac646bcb8ed3d3cfb2bda14e05e11abfcfe980d1 --- services/core/java/com/android/server/am/ActivityStack.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index d89fa1583048c..edd8b35898a1c 100644 --- 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) {