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

Merge "Don‘t consider adjacent launch root if the existing task is't on top" into udc-dev am: 6f0bcaf443

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

Change-Id: I9a71e67c85d4f9f73e5ac7e03f2d8b277e358223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jeff Chang
2023-05-11 09:29:15 +00:00
committed by Automerger Merge Worker
parent 5e567f6f51 6f0bcaf443
commit 527c6dfb89
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/ActivityStarter.java
View File

@@ -2929,7 +2929,8 @@ class ActivityStarter {
// the adjacent task as its launch target. So the existing task will be launched into the
// closer one and won't be reparent redundantly.
final Task adjacentTargetTask = mTargetRootTask.getAdjacentTask();
if (adjacentTargetTask != null && intentActivity.isDescendantOf(adjacentTargetTask)) {
if (adjacentTargetTask != null && intentActivity.isDescendantOf(adjacentTargetTask)
&& intentTask.isOnTop()) {
mTargetRootTask = adjacentTargetTask;
}