Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0

2011-10-13 16:44:26 -07:00
parent e6063299d8 eabd328dee
commit 97e9ea98af
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/am/ActivityStack.java
+++ b/services/java/com/android/server/am/ActivityStack.java
@@ -2067,7 +2067,7 @@ final class ActivityStack {
     * task starting at a specified index.
     */
    private final void performClearTaskAtIndexLocked(int taskId, int i) {
-        while (i < (mHistory.size()-1)) {
+        while (i < mHistory.size()) {
            ActivityRecord r = mHistory.get(i);
            if (r.task.taskId != taskId) {
                // Whoops hit the end.