Preemptively reset split reparenting flag when entering split

- Currently, this flag is not reset until we start the animation or when
  the stage visibilities officially change, but following a drop to
  initiate split and Shell actually receiving the transition,
  the app may launch a trampoline activity (ie. esp during create)
  which will trigger the task to be reparented back out of the
  split root (preventing split from succeeding).  Instead we preemptively
  reset this state when we know that we are about to enter split, and
  rely on the existing paths to update the flag when the split is next
  fully shown or hidden.

Bug: 292454704
Test: Drag app that launches a trampoline into split
Change-Id: I17c8b7e92dfbf18a1bd1a9ca64b7ee7f3097f233

1 files changed, 5 insertions, 0 deletions

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
index 94fa485efd5c..8efdfd6ca1e1 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -1551,6 +1551,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
             @Nullable ActivityManager.RunningTaskInfo taskInfo, @SplitPosition int startPosition,
             boolean resizeAnim) {
         onSplitScreenEnter();
+        // Preemptively reset the reparenting behavior if we know that we are entering, as starting
+        // split tasks with activity trampolines can inadvertently trigger the task to be
+        // reparented out of the split root mid-launch
+        wct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,
+                false /* setReparentLeafTaskIfRelaunch */);
         if (isSplitActive()) {
             prepareBringSplit(wct, taskInfo, startPosition, resizeAnim);
         } else {