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

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

am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev 

* commit 'f32b22e9':
  Move task to top in window manager.
parents 99d60784 f32b22e9

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

+2 −0
Original line number Diff line number Diff line
@@ -1753,6 +1753,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            TaskRecord sourceTask = sourceRecord.task;

            targetStack = sourceTask.stack;

            targetStack.moveToFront();

            mWindowManager.moveTaskToTop(sourceTask.taskId);

            if (!addingToTask &&

                    (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {

                // In this case, we are adding the activity to an existing
@@ -1808,6 +1809,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            r.setTask(prev != null ? prev.task

                    : targetStack.createTaskRecord(getNextTaskId(), r.info, intent, true),

                    null, true);

            mWindowManager.moveTaskToTop(r.task.taskId);

            if (DEBUG_TASKS) Slog.v(TAG, "Starting new activity " + r

                    + " in new guessed " + r.task);

        }