Merge "Fix not auto pip after swipe split pair to home" into udc-dev

2023-06-06 00:43:48 +00:00
parent 7188455268 9e03601a09
commit 64d7bea916
1 changed files with 2 additions and 1 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -2907,7 +2907,8 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
        }

        setSplitsVisible(false);
-        prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, finishWct);
+        finishWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token,
+                true /* reparentLeafTaskIfRelaunch */);
        logExit(EXIT_REASON_UNKNOWN);
    }