diff options
| author | 2022-12-20 08:22:25 +0000 | |
|---|---|---|
| committer | 2022-12-20 08:22:25 +0000 | |
| commit | c48a3d65bb6f783e0fb36d436c1a1163111d1db3 (patch) | |
| tree | b797301994bd58c7292a84da8bca000763224c9b | |
| parent | d3578da9da7950bc71a3d8b9e2f51edc07c7a0d1 (diff) | |
| parent | 319863cc4fde10f788db0f945d68bdc345bf692f (diff) | |
Merge "Skype is not opening in full screen" am: 319863cc4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2357423
Change-Id: Ibf9957b29979e6aea69314ed462398c7c6c3e910
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 ff09163c151d..330c09876e1e 100644 --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java @@ -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; |