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

Commit 319863cc authored by Jerry Chang's avatar Jerry Chang Committed by Gerrit Code Review
Browse files

Merge "Skype is not opening in full screen"

parents cb0b34a5 0e829258

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

+6 −2
Original line number Diff line number Diff line
@@ -1085,10 +1085,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;