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

Commit 9e114b2d authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge \\\"Revert \\\"Don\\\'t update task to return to type for last task over... 

Merge \\\"Revert \\\"Don\\\'t update task to return to type for last task over home\\\"\\\" into nyc-dev am: 5c176ff1 am: 01cc848c
am: e9f326e8

Change-Id: Icfb23fadd2efdd9b37e080797752fc5ce0d2a57e
parents 6e08e76d e9f326e8

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

+1 −7
Original line number Diff line number Diff line
@@ -2581,14 +2581,11 @@ final class ActivityStack { 
    }



    private void insertTaskAtTop(TaskRecord task, ActivityRecord newActivity) {

        boolean isLastTaskOverHome = false;

        // If the moving task is over home stack, transfer its return type to next task

        if (task.isOverHomeStack()) {

            final TaskRecord nextTask = getNextTask(task);

            if (nextTask != null) {

                nextTask.setTaskToReturnTo(task.getTaskToReturnTo());

            } else {

                isLastTaskOverHome = true;

            }

        }
@@ -2598,10 +2595,7 @@ final class ActivityStack { 
            ActivityStack lastStack = mStackSupervisor.getLastStack();

            final boolean fromHome = lastStack.isHomeStack();

            if (!isHomeStack() && (fromHome || topTask() != task)) {

                // If it's a last task over home - we default to keep its return to type not to

                // make underlying task focused when this one will be finished.

                int returnToType = isLastTaskOverHome

                        ? task.getTaskToReturnTo() : APPLICATION_ACTIVITY_TYPE;

                int returnToType = APPLICATION_ACTIVITY_TYPE;

                if (fromHome && StackId.allowTopTaskToReturnHome(mStackId)) {

                    returnToType = lastStack.topTask() == null

                            ? HOME_ACTIVITY_TYPE : lastStack.topTask().taskType;