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

Commit abcc59c3 authored by Craig Mautner's avatar Craig Mautner
Browse files

Pass correct task to window manager 

The target task when starting is not always the top task. If it's not
the window manager gets into a bad state.

Fixes bug 14684143.

Change-Id: I90145ae43bdc5d980dc25ac19e12aa84debfed71
parent e4f19606

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

+1 −1
Original line number Diff line number Diff line
@@ -1818,7 +1818,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