From cb1dde606e54a87e346c90c2bfdea8c536b01a02 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Thu, 6 Feb 2020 13:53:46 -0800
Subject: [PATCH] TaskOrganizer: Always launch MULTI_WINDOW tasks in new stack

Otherwise they all end up under a single root task and we can't
organize them independently.

Bug: 139371701
Test: TaskOrganizerMultiWindowTest
Change-Id: I0e2571c23e405efeb9accbd30e68783bba07898d
---
 services/core/java/com/android/server/wm/DisplayContent.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index 810aa3438ea01..4f1df7da27f12 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -5659,7 +5659,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
         return activityType == ACTIVITY_TYPE_STANDARD
                 && (windowingMode == WINDOWING_MODE_FULLSCREEN
                 || windowingMode == WINDOWING_MODE_FREEFORM
-                || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);
+                || windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY
+                || windowingMode == WINDOWING_MODE_MULTI_WINDOW);
     }
 
     /**