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

Merge "[ActivityManager] Fix index OOB when resetting removed task"

Browse Source
This commit is contained in:
Craig Mautner
2015-03-11 13:46:37 +00:00
committed by Gerrit Code Review
parent a6ed1b9547 1d7919a7eb
commit 686947801e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2445,9 +2445,11 @@ final class ActivityStack {
} }
int taskNdx = mTaskHistory.indexOf(task); int taskNdx = mTaskHistory.indexOf(task);
do { if (taskNdx >= 0) {
taskTop = mTaskHistory.get(taskNdx--).getTopActivity(); do {
} while (taskTop == null && taskNdx >= 0); taskTop = mTaskHistory.get(taskNdx--).getTopActivity();
} while (taskTop == null && taskNdx >= 0);
}
if (topOptions != null) { if (topOptions != null) {
// If we got some ActivityOptions from an activity on top that // If we got some ActivityOptions from an activity on top that