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

Commit 3bf0fb1a authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Fix oversight when checking in last CL"

parents dbd60a71 dd221b37

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

+2 −0
Original line number Diff line number Diff line
@@ -1776,6 +1776,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                return ActivityManager.START_RETURN_LOCK_TASK_MODE_VIOLATION;

            }

            targetStack = sourceTask.stack;

            targetStack.moveToFront();

            mWindowManager.moveTaskToTop(sourceTask.taskId);

            if (!addingToTask &&

                    (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {
@@ -1827,6 +1828,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            // of a new task...  just put it in the top task, though these days

            // this case should never happen.

            targetStack = adjustStackFocus(r);

            targetStack.moveToFront();

            ActivityRecord prev = targetStack.topActivity();

            r.setTask(prev != null ? prev.task

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