commit da7b3c286be7dc2d91f5476d8e2ce0f36799b42f
author chaviw <chaviw@google.com> Fri Apr 24 11:25:08 2020 -0700
committer chaviw <chaviw@google.com> Wed Apr 29 09:36:34 2020 -0700
tree bba9d61ca1f6ad4a1300a718167220044c3fe884
parent 12a32f35d78f441401338af3f486faded5378a0c

Re-parent children when Organized Window is no longer controlled

When an Organized Window is no longer controlled by a specific client,
we create a new SurfaceControl and reparent the children so the client
no longer has control over the WindowContainer

Test: Pip, TaskOrganizerMultiWindowTest
Bug: 154558563
Change-Id: I76e0da115fd48f982a82bd6e2351e7171934acfc

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 306c100..9d229df 100644
--- a/services/core/java/com/android/server/wm/TaskOrganizerController.java
+++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java
@@ -211,6 +211,7 @@
 
         void removeTask(Task t) {
             if (t.mTaskAppearedSent) {
+                t.migrateToNewSurfaceControl();
                 t.mTaskAppearedSent = false;
                 mOrganizer.onTaskVanished(t);
             }