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

Commit e0a7e697 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: If36c8ad7575edac352a5866fde3f64082082126d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60d213c2 e36af148

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;

        }