From 825e8efc2f6db7d137043491494e6a427d093dbd Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Thu, 10 Jun 2021 04:13:48 +0000 Subject: [PATCH] Keep the task in main stage at top after dismissed split due to fold Fix: 189333036 Fix: 189723946 Bug: 188010345 Test: atest WMShellUnitTests Test: trigger staged split, the task in main stage will remain at top after dismissed split due to fold. Change-Id: If2a795bed7073efcea70129e62aacdaad3efa602 --- .../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 bb1d06fbbbf2e..66989329860b6 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 @@ -609,7 +609,7 @@ class StageCoordinator implements SplitLayout.SplitLayoutHandler, private void onFoldedStateChanged(boolean folded) { if (folded && mMainStage.isActive()) { - exitSplitScreen(); + exitSplitScreen(mMainStage); } }