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

Commit 724294ea authored by Tony Huang's avatar Tony Huang
Browse files

Fix failed while running same pair again 

The exitSplit called while we launch the same split pair caused
it cannot enter split successful then lead to tests failed.

Add check isEnteringSplit check for that exitSplit.

Fix: 262595710
Test: atest NexusLauncherTests
Change-Id: I8666476ff76e3912542d30441b144c67baed9f38
parent 3b7ae930

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

+1 −1
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
                mSplitLayout.flingDividerToDismiss(

                        mSideStagePosition != SPLIT_POSITION_BOTTOM_OR_RIGHT,

                        EXIT_REASON_APP_FINISHED);

            } else if (!isSplitScreenVisible()) {

            } else if (!isSplitScreenVisible() && !mIsSplitEntering) {

                exitSplitScreen(null /* childrenToTop */, EXIT_REASON_APP_FINISHED);

            }

        } else if (isSideStage && hasChildren && !mMainStage.isActive()) {