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

Commit ab7a9993 authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Skype is not opening in full screen" am: 319863cc am: c48a3d65 am: 02c3369c 

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



Change-Id: I0b602fd69c04c7a328d323d9be4d8af098513b1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2e288244 02c3369c

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

+6 −2
Original line number Diff line number Diff line
@@ -1074,10 +1074,14 @@ final class TaskDisplayArea extends DisplayArea<WindowContainer> { 
        // Use launch-adjacent-flag-root if launching with launch-adjacent flag.

        if ((launchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0

                && mLaunchAdjacentFlagRootTask != null) {

            // If the adjacent launch is coming from the same root, launch to adjacent root instead.

            if (sourceTask != null && mLaunchAdjacentFlagRootTask.getAdjacentTaskFragment() != null

            if (sourceTask != null && sourceTask == candidateTask) {

                // Do nothing when task that is getting opened is same as the source.

            } else if (sourceTask != null

                    && mLaunchAdjacentFlagRootTask.getAdjacentTaskFragment() != null

                    && (sourceTask == mLaunchAdjacentFlagRootTask

                    || sourceTask.isDescendantOf(mLaunchAdjacentFlagRootTask))) {

                // If the adjacent launch is coming from the same root, launch to

                // adjacent root instead.

                return mLaunchAdjacentFlagRootTask.getAdjacentTaskFragment().asTask();

            } else {

                return mLaunchAdjacentFlagRootTask;