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

Commit 0c50e33c authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Run transition when app dies in freeform" into tm-qpr-dev

parents 3dc3657f cdb03b30

services/core/java/com/android/server/wm/RootWindowContainer.java

+4 −5
Original line number Diff line number Diff line
@@ -2282,11 +2282,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                    resumedOnDisplay[0] |= curResult;

                    return;

                }

                if (rootTask.getDisplayArea().isTopRootTask(rootTask)

                        && topRunningActivity.isState(RESUMED)) {

                    // Kick off any lingering app transitions form the MoveTaskToFront

                    // operation, but only consider the top task and root-task on that

                    // display.

                if (topRunningActivity.isState(RESUMED)

                        && topRunningActivity == rootTask.getDisplayArea().topRunningActivity()) {

                    // Kick off any lingering app transitions form the MoveTaskToFront operation,

                    // but only consider the top activity on that display.

                    rootTask.executeAppTransition(targetOptions);

                } else {

                    resumedOnDisplay[0] |= topRunningActivity.makeActiveIfNeeded(target);

services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ public class RootWindowContainerTests extends WindowTestsBase { 


        // Assume the task is at the topmost position

        assertFalse(rootTask.isTopRootTaskInDisplayArea());

        doReturn(rootTask).when(mRootWindowContainer).getTopDisplayFocusedRootTask();

        doReturn(taskDisplayArea.getHomeActivity()).when(taskDisplayArea).topRunningActivity();



        // Use the task as target to resume.

        mRootWindowContainer.resumeFocusedTasksTopActivities();