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

Commit 50aac992 authored by Jerry Chang's avatar Jerry Chang
Browse files

Fix mismatching surfaces position when entering split with two intents 

Updates the sequence of indicating side stage position in startIntents
to make sure to use the same and the correct split position to update
both window bounds and surface bounds.

Bug: 290167860
Test: repro steps of the bug
Change-Id: I299a5d6a7195c26a9caad904796e39c0db3113bf
parent 861cc9ab

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

+1 −1
Original line number Diff line number Diff line
@@ -732,12 +732,12 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            mMainStage.activate(wct, false /* reparent */);

        }



        setSideStagePosition(splitPosition, wct);

        mSplitLayout.setDivideRatio(splitRatio);

        updateWindowBounds(mSplitLayout, wct);

        wct.reorder(mRootTaskInfo.token, true);

        setRootForceTranslucent(false, wct);



        setSideStagePosition(splitPosition, wct);

        options1 = options1 != null ? options1 : new Bundle();

        addActivityOptions(options1, mSideStage);

        if (shortcutInfo1 != null) {