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

2023-05-11 09:17:59 +00:00
parent 51fa66ef63 36f5d615f4
commit 6f0bcaf443
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -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;
        }