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

Commit 36f5d615 authored by Jeff Chang's avatar Jeff Chang
Browse files

Don‘t consider adjacent launch root if the existing task is't on top 

The adjacent task is considered as a launch root task if an existing
task is already in the adjacent task of the launch target. This CL
updates the policy while the task is located in an adjacent task and
the existing task is on the top.

Bug: 280392203
Test: atest ActivityStarterTests
Test: split(A|B)->split(A,C|B),drag A to B’side, Result:split(C|A)
Change-Id: I006de0438c572defe4f770d29378c8ddfadc351d
parent c111807c

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

        }