diff options
| author | 2023-11-01 11:05:00 +0000 | |
|---|---|---|
| committer | 2023-11-01 11:05:00 +0000 | |
| commit | ee17337e28a26819b3f5c2676d35551ab4637d61 (patch) | |
| tree | ccc4587b28b0f1b7076f8ddcecb3e717cd8b1303 | |
| parent | c4f825d83509a0f7eff31477a46eb537aa38da72 (diff) | |
| parent | 1d8ce6fa7220753fcb793e4117bf8a645cfa010c (diff) | |
Merge "Allow ACTIVITY_TYPE_RECENTS to have multiple root tasks" into main am: 7a0fa2c8e8 am: 20d7df51d3 am: 1d8ce6fa72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804293
Change-Id: Ibfae2c29d3ec40c9f9088d6fd02bda7351790f19
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 6cad16c7db40..5c5a1e1d23dc 100644 --- a/services/core/java/com/android/server/wm/Task.java +++ b/services/core/java/com/android/server/wm/Task.java @@ -6541,11 +6541,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=" |