Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee17337e authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Allow ACTIVITY_TYPE_RECENTS to have multiple root tasks" into main am:... 

Merge "Allow ACTIVITY_TYPE_RECENTS to have multiple root tasks" into main am: 7a0fa2c8 am: 20d7df51 am: 1d8ce6fa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2804293



Change-Id: Ibfae2c29d3ec40c9f9088d6fd02bda7351790f19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4f825d8 1d8ce6fa

services/core/java/com/android/server/wm/Task.java

+4 −4
Original line number Diff line number Diff line
@@ -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="