Merge "Skype is not opening in full screen" into tm-qpr-dev (89387bcc) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Original line	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.		// Use launch-adjacent-flag-root if launching with launch-adjacent flag.
	if ((launchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0		if ((launchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT) != 0
	&& mLaunchAdjacentFlagRootTask != null) {		&& mLaunchAdjacentFlagRootTask != null) {
	// If the adjacent launch is coming from the same root, launch to adjacent root instead.		if (sourceTask != null && sourceTask == candidateTask) {
	if (sourceTask != null && mLaunchAdjacentFlagRootTask.getAdjacentTaskFragment() != null		// Do nothing when task that is getting opened is same as the source.
			} else if (sourceTask != null
			&& mLaunchAdjacentFlagRootTask.getAdjacentTaskFragment() != null
	&& (sourceTask == mLaunchAdjacentFlagRootTask		&& (sourceTask == mLaunchAdjacentFlagRootTask
	\|\| sourceTask.isDescendantOf(mLaunchAdjacentFlagRootTask))) {		\|\| sourceTask.isDescendantOf(mLaunchAdjacentFlagRootTask))) {
			// If the adjacent launch is coming from the same root, launch to
			// adjacent root instead.
	return mLaunchAdjacentFlagRootTask.getAdjacentTaskFragment().asTask();		return mLaunchAdjacentFlagRootTask.getAdjacentTaskFragment().asTask();
	} else {		} else {
	return mLaunchAdjacentFlagRootTask;		return mLaunchAdjacentFlagRootTask;