diff options
| author | 2023-11-01 10:25:29 +0000 | |
|---|---|---|
| committer | 2023-11-01 10:25:29 +0000 | |
| commit | 1d8ce6fa7220753fcb793e4117bf8a645cfa010c (patch) | |
| tree | 2425f7660b935ccdba70a51ff3f2fa81e758c540 | |
| parent | 68f48a3117ceaa2e406bc77bfaff50674aee60b7 (diff) | |
| parent | 20d7df51d3962b1b6c43f5d106be61b8ab450627 (diff) | |
Merge "Allow ACTIVITY_TYPE_RECENTS to have multiple root tasks" into main am: 7a0fa2c8e8 am: 20d7df51d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804293
Change-Id: Ice9c0615da45d07fef1ca07c57f65d5594aa9100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/Task.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java index 2962af487b07..2f85fa3c0285 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -6533,11 +6533,11 @@ class Task extends TaskFragment { mActivityType = ACTIVITY_TYPE_STANDARD; } - if (mActivityType != ACTIVITY_TYPE_STANDARD + if (!DisplayContent.alwaysCreateRootTask(tda.getWindowingMode(), mActivityType) && mActivityType != ACTIVITY_TYPE_UNDEFINED) { - // For now there can be only one root task of a particular non-standard activity - // type on a display. So, get that ignoring whatever windowing mode it is - // currently in. + // Only Recents or Standard activity types are allowed to have more than one + // root task on a display, this is independent of whatever windowing mode it + // is currently in. Task rootTask = tda.getRootTask(WINDOWING_MODE_UNDEFINED, mActivityType); if (rootTask != null) { throw new IllegalArgumentException("Root task=" + rootTask + " of activityType=" |