Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d38ef87d authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Preemptively reset split reparenting flag when entering split" into... 

Merge "Preemptively reset split reparenting flag when entering split" into udc-qpr-dev am: e77f5fa0 am: 558d5bd0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24812535



Change-Id: Ib36301bd7a9083c6ec45867bf572b075736fb264
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f2c27d6 558d5bd0

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+5 −0
Original line number Diff line number Diff line
@@ -1554,6 +1554,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 {