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

Commit 10caa3b8 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am d3b2fa49: am e1db0dd0: Test for task in front must include stack in front. 

* commit 'd3b2fa49':
  Test for task in front must include stack in front.
parents 5d96f61a d3b2fa49

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

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

        if (task != null && task.removeActivity(r)) {

            if (DEBUG_STACK) Slog.i(TAG,

            if (DEBUG_STACK) Slog.i(TAG,

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

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

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

            if (mStackSupervisor.isFrontStack(this) && task == topTask() && task.mOnTopOfHome) {

                mStackSupervisor.moveHomeToTop();

                mStackSupervisor.moveHomeToTop();

            }

            }

            mStackSupervisor.removeTask(task);

            mStackSupervisor.removeTask(task);