diff options
| author | 2022-12-20 08:57:30 +0000 | |
|---|---|---|
| committer | 2022-12-20 08:57:30 +0000 | |
| commit | 02c3369cf1de6792d4b619c1d26726a7ad2e7ca8 (patch) | |
| tree | 06686efd293f5ac90091d5b0dbb85e3f3e0be230 | |
| parent | 16aab7f2606bb84c6b11b6defa032b9e68d5eb60 (diff) | |
| parent | c48a3d65bb6f783e0fb36d436c1a1163111d1db3 (diff) | |
Merge "Skype is not opening in full screen" am: 319863cc4f am: c48a3d65bb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2357423
Change-Id: I4a8ae3d5a05b72cf5624f997d9fad8df71436ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/TaskDisplayArea.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java index 8ad76a3eb327..79be9463aa05 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -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; |