From 724294eaf964f711abe2508b61d760a15400f645 Mon Sep 17 00:00:00 2001
From: Tony Huang <tonyychuang@google.com>
Date: Thu, 15 Dec 2022 04:47:02 +0000
Subject: [PATCH] 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
---
 .../src/com/android/wm/shell/splitscreen/StageCoordinator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5be29db12b254..717ae91f74c52 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
@@ -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()) {