Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97e9ea98 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

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

parents e6063299 eabd328d

services/java/com/android/server/am/ActivityStack.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2067,7 +2067,7 @@ final class ActivityStack { 
     * task starting at a specified index.

     * task starting at a specified index.

     */

     */

    private final void performClearTaskAtIndexLocked(int taskId, int i) {

    private final void performClearTaskAtIndexLocked(int taskId, int i) {

        while (i < (mHistory.size()-1)) {

        while (i < mHistory.size()) {

            ActivityRecord r = mHistory.get(i);

            ActivityRecord r = mHistory.get(i);

            if (r.task.taskId != taskId) {

            if (r.task.taskId != taskId) {

                // Whoops hit the end.

                // Whoops hit the end.