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

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

Browse Source 
* commit 'ce7dba6bdf2345f39ad8f39b8a4c1bac9bcd35ea':
  [ActivityManager] Fix index OOB when updating visible.
This commit is contained in:
Wale Ogunwale
2015-06-18 14:47:09 +00:00
committed by Android Git Automerger
parent aeed5c47c6 ce7dba6bdf
commit 8f2bc09f52
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1258,6 +1258,10 @@ final class ActivityStack {
} }
if (r != starting) { if (r != starting) {
mStackSupervisor.startSpecificActivityLocked(r, false, false); 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) { } else if (r.visible) {