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

Commit 6f0bcaf4 authored by Jeff Chang's avatar Jeff Chang Committed by Android (Google) Code Review
Browse files

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

parents 51fa66ef 36f5d615

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;

        }