diff options
| author | 2023-09-22 05:27:53 +0000 | |
|---|---|---|
| committer | 2023-09-22 05:27:53 +0000 | |
| commit | 558d5bd023b9a5622fcd07f0ba14ead8605ea673 (patch) | |
| tree | 73529ffd3ceb1893cc251910591290a892efce95 | |
| parent | 1de863a4d902994fa5188aa79ec2e47fc2e44a48 (diff) | |
| parent | e77f5fa086954236b3657d2763977237771b88fe (diff) | |
Merge "Preemptively reset split reparenting flag when entering split" into udc-qpr-dev am: e77f5fa086
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24812535
Change-Id: Ie187c4f4aabda3ec21799e8b5c381e9d0775a8ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 5 |
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 { |