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

Commit 17605548 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I77331831097332ead1856ab74efc093c5672b352
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 959afa05 e36af148

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

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

        // the adjacent task as its launch target. So the existing task will be launched into the

        // closer one and won't be reparent redundantly.

        // closer one and won't be reparent redundantly.

        final Task adjacentTargetTask = mTargetRootTask.getAdjacentTask();

        final Task adjacentTargetTask = mTargetRootTask.getAdjacentTask();

        if (adjacentTargetTask != null && intentActivity.isDescendantOf(adjacentTargetTask)) {

        if (adjacentTargetTask != null && intentActivity.isDescendantOf(adjacentTargetTask)

                && intentTask.isOnTop()) {

            mTargetRootTask = adjacentTargetTask;

            mTargetRootTask = adjacentTargetTask;

        }

        }