commit 00c0dbe2cb8f95fcb064faf2952a953cf8662b46
author Robert Carr <racarr@google.com> Fri Jan 24 15:30:24 2020 -0800
committer Robert Carr <racarr@google.com> Thu Jan 30 12:58:32 2020 -0800
tree 1f4c312ca6478a573e5662ff4093343227166cc0
parent f0a9dd1e946bc3b337d9b09e3517ffad62a94ff3

TaskOrganizer: Add WINDOWING_MODE_MULTI_WINDOW support

Also add small test activity.

Bug: 139371701
Test: TaskOrganizerTests. TaskOrganizerMultiWindowTest.
Change-Id: I0bea25a5c8eef25fba88a0d056ef464035749a59

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

diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java
index 283be40..66c65e2 100644
--- a/services/core/java/com/android/server/wm/TaskOrganizerController.java
+++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java
@@ -17,6 +17,7 @@
 package com.android.server.wm;
 
 import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
+import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
 
 import android.os.IBinder;
 import android.os.RemoteException;
@@ -106,9 +107,11 @@
      * and receive taskVanished callbacks in the process.
      */
     void registerTaskOrganizer(ITaskOrganizer organizer, int windowingMode) {
-        if (windowingMode != WINDOWING_MODE_PINNED) {
+        if (windowingMode != WINDOWING_MODE_PINNED &&
+            windowingMode != WINDOWING_MODE_MULTI_WINDOW) {
             throw new UnsupportedOperationException(
-                    "As of now only Pinned windowing mode is supported for registerTaskOrganizer");
+                    "As of now only Pinned and Multiwindow windowing modes are"
+                    + " supported for registerTaskOrganizer");
 
         }
         clearIfNeeded(windowingMode);