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

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

Merge "Unconditionally move stack to front." into lmp-dev

parents 66946e22 02a4aa26

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

+2 −1
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        if (err == ActivityManager.START_SUCCESS) {

            final int userId = aInfo != null ? UserHandle.getUserId(aInfo.applicationInfo.uid) : 0;

            Slog.i(TAG, "START u" + userId + " {" + intent.toShortString(true, true, true, false)

                    + "} from pid " + (callerApp != null ? callerApp.pid : callingPid)

                    + "} from uid " + callingUid

                    + " on display " + (container == null ? (mFocusedStack == null ?

                            Display.DEFAULT_DISPLAY : mFocusedStack.mDisplayId) :

                            (container.mActivityDisplay == null ? Display.DEFAULT_DISPLAY :
@@ -2075,6 +2075,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
            }

            targetStack = inTask.stack;

            targetStack.moveTaskToFrontLocked(inTask, r, options);

            targetStack.moveToFront();

            mWindowManager.moveTaskToTop(inTask.taskId);



            // Check whether we should actually launch the new activity in to the task,