Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skype is not opening in full screen"

Browse Source
This commit is contained in:
Jerry Chang
2022-12-20 07:59:16 +00:00
committed by Gerrit Code Review
parent cb0b34a58e 0e829258a2
commit 319863cc4f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -1085,10 +1085,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;