Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I6833d8392f3c58a70d00c7ffbf65edb2998ac6e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kazuki Takise
2023-03-23 03:39:20 +00:00
committed by Automerger Merge Worker
parent 5e783d5b96 b22c993b97
commit e4dbc02bdc
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/wm/RootWindowContainer.java
View File

@@ -2281,11 +2281,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
resumedOnDisplay[0] |= curResult; resumedOnDisplay[0] |= curResult;
return; return;
} }
if (rootTask.getDisplayArea().isTopRootTask(rootTask) if (topRunningActivity.isState(RESUMED)
&& topRunningActivity.isState(RESUMED)) { && topRunningActivity == rootTask.getDisplayArea().topRunningActivity()) {
// Kick off any lingering app transitions from the MoveTaskToFront // Kick off any lingering app transitions form the MoveTaskToFront operation,
// operation, but only consider the top task and root-task on that // but only consider the top activity on that display.
// display.
rootTask.executeAppTransition(targetOptions); rootTask.executeAppTransition(targetOptions);
} else { } else {
resumedOnDisplay[0] |= topRunningActivity.makeActiveIfNeeded(target); resumedOnDisplay[0] |= topRunningActivity.makeActiveIfNeeded(target);

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

@@ -775,7 +775,7 @@ public class RootWindowContainerTests extends WindowTestsBase {
// Assume the task is at the topmost position // Assume the task is at the topmost position
assertFalse(rootTask.isTopRootTaskInDisplayArea()); assertFalse(rootTask.isTopRootTaskInDisplayArea());
doReturn(rootTask).when(mRootWindowContainer).getTopDisplayFocusedRootTask(); doReturn(taskDisplayArea.getHomeActivity()).when(taskDisplayArea).topRunningActivity();
// Use the task as target to resume. // Use the task as target to resume.
mRootWindowContainer.resumeFocusedTasksTopActivities(); mRootWindowContainer.resumeFocusedTasksTopActivities();