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

Commit b2a979a3 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android Git Automerger
Browse files

am e43d43c3: Merge "Fixed issue with moveTaskToBack on single stack devices" into mnc-dev 

* commit 'e43d43c3':
  Fixed issue with moveTaskToBack on single stack devices
parents bb5b3ca2 e43d43c3

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

+7 −3
Original line number Diff line number Diff line
@@ -3740,7 +3740,12 @@ final class ActivityStack { 
        if (DEBUG_TRANSITION) Slog.v(TAG_TRANSITION, "Prepare to back transition: task=" + taskId);



        boolean prevIsHome = false;

        if (tr.isOverHomeStack()) {



        // If true, we should resume the home activity next if the task we are moving to the

        // back is over the home stack. We force to false if the task we are moving to back

        // is the home task and we don't want it resumed after moving to the back.

        final boolean canGoHome = !tr.isHomeTask() && tr.isOverHomeStack();

        if (canGoHome) {

            final TaskRecord nextTask = getNextTask(tr);

            if (nextTask != null) {

                nextTask.setTaskToReturnTo(tr.getTaskToReturnTo());
@@ -3774,8 +3779,7 @@ final class ActivityStack { 
        }



        final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;

        if (prevIsHome || task == tr && tr.isOverHomeStack()

                || numTasks <= 1 && isOnHomeDisplay()) {

        if (prevIsHome || (task == tr && canGoHome) || (numTasks <= 1 && isOnHomeDisplay())) {

            if (!mService.mBooting && !mService.mBooted) {

                // Not ready yet!

                return false;