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

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

Merge "Pass correct task to window manager"

parents a76a150f abcc59c3

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

+1 −1
Original line number Diff line number Diff line
@@ -1816,7 +1816,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            }

            targetStack = sourceTask.stack;

            targetStack.moveToFront();

            mWindowManager.moveTaskToTop(sourceTask.taskId);

            mWindowManager.moveTaskToTop(targetStack.topTask().taskId);

            if (!addingToTask &&

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

                // In this case, we are adding the activity to an existing