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

Commit 8c94d9fb authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #17329066: Crash in ActivityManager" into lmp-dev

parents 9d75e95f 2c924fb2

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

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

            targetStack = inTask.stack;

            targetStack.moveTaskToFrontLocked(inTask, r, options);

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

            mWindowManager.moveTaskToTop(inTask.taskId);



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

            // or just reuse the current activity on top.