Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9c4601e4: am 77b09382: Merge "[ActivityManager] Fix index OOB when updating visible." into mnc-dev

Browse Source 
* commit '9c4601e4460fef39fe015087bf92a79cdd96d39f':
  [ActivityManager] Fix index OOB when updating visible.
This commit is contained in:
Wale Ogunwale
2015-06-18 15:16:55 +00:00
committed by Android Git Automerger
parent 3b109decdd 9c4601e446
commit 91ef7852dc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -1326,7 +1326,12 @@ final class ActivityStack {
if (r != starting) { if (r != starting) {
mStackSupervisor.startSpecificActivityLocked( mStackSupervisor.startSpecificActivityLocked(
r, noStackActivityResumed, false); r, noStackActivityResumed, false);
noStackActivityResumed = false; if (activityNdx >= activities.size()) {
// Record may be removed if its process needs to restart.
activityNdx = activities.size() - 1;
} else {
noStackActivityResumed = false;
}
} }
} else if (r.visible) { } else if (r.visible) {