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

Commit d66f6e75 authored by Kazuki Takise's avatar Kazuki Takise Committed by Automerger Merge Worker
Browse files

Merge "Run transition when app dies in freeform" into udc-dev am: b22c993b am: e4dbc02b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22104399



Change-Id: Iff7a036528dc8225027e595438e1e4029fea223f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d8580f8b e4dbc02b

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

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

                    return;

                }

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

                        && topRunningActivity.isState(RESUMED)) {

                    // Kick off any lingering app transitions from 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
@@ -775,7 +775,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();