diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-10-13 16:44:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 16:44:26 -0700 |
| commit | 97e9ea98afac197722d7620d5fd09a8c06aafe3a (patch) | |
| tree | 7118b88a94b9b44fff9eff9009509bb60bb65dd6 | |
| parent | e6063299d874cc3b9d1fa71d0c3772c6ebe62e06 (diff) | |
| parent | eabd328deea453a31d6b8f738c5bf0c3974d48b1 (diff) | |
| download | frameworks_base-97e9ea98afac197722d7620d5fd09a8c06aafe3a.zip frameworks_base-97e9ea98afac197722d7620d5fd09a8c06aafe3a.tar.gz frameworks_base-97e9ea98afac197722d7620d5fd09a8c06aafe3a.tar.bz2 | |
Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index b9d3d76..1aed7fe 100644 --- 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. |