Merge "Collect change before starting transition" into udc-dev

2023-05-05 17:29:42 +00:00
parent 0a55efee89 85f765908c
commit 793951c7c9
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/ActivityClientController.java
+++ b/services/core/java/com/android/server/wm/ActivityClientController.java
@@ -1159,9 +1159,10 @@ class ActivityClientController extends IActivityClientController.Stub {
            }
            return;
        }
+        transition.collect(topFocusedRootTask);
+        executeMultiWindowFullscreenRequest(fullscreenRequest, topFocusedRootTask);
        r.mTransitionController.requestStartTransition(transition, topFocusedRootTask,
                null /* remoteTransition */, null /* displayChange */);
-        executeMultiWindowFullscreenRequest(fullscreenRequest, topFocusedRootTask);
        transition.setReady(topFocusedRootTask, true);
    }