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

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

Merge "Remove the launch root switch logic" into udc-qpr-dev am: 42a71be4 

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



Change-Id: I2e84a569e2a78ec4e80b71ab984cece42d2f1e23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d33b4421 42a71be4

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

+0 −9
Original line number Diff line number Diff line
@@ -2925,15 +2925,6 @@ class ActivityStarter { 
            }

        }



        // If the matching task is already in the adjacent task of the launch target. Adjust to use

        // 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)

                && intentTask.isOnTop()) {

            mTargetRootTask = adjacentTargetTask;

        }



        // If the target task is not in the front, then we need to bring it to the front...

        // except...  well, with SINGLE_TASK_LAUNCH it's not entirely clear. We'd like to have

        // the same behavior as if a new instance was being started, which means not bringing it