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

Commit 22e4a1b8 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 10ea1978: Merge "Only return to home if the foreground task is removed." into klp-dev 

* commit '10ea1978':
  Only return to home if the foreground task is removed.
parents 79ddf835 10ea1978

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

+2 −2
Original line number Diff line number Diff line
@@ -2628,10 +2628,10 @@ final class ActivityStack { 
        if (task != null && task.removeActivity(r)) {

            if (DEBUG_STACK) Slog.i(TAG,

                    "removeActivityFromHistoryLocked: last activity removed from " + this);

            mStackSupervisor.removeTask(task);

            if (task.mOnTopOfHome) {

            if (task == topTask() && task.mOnTopOfHome) {

                mStackSupervisor.moveHomeToTop();

            }

            mStackSupervisor.removeTask(task);

        }

        r.takeFromHistory();

        removeTimeoutsForActivityLocked(r);