diff options
| author | 2025-03-12 12:09:53 -0700 | |
|---|---|---|
| committer | 2025-03-12 12:09:53 -0700 | |
| commit | ad87661f436b3048ade53f1af95f01dd0e808337 (patch) | |
| tree | c7302282a30ca78c2ea727803ca0489d5dd94783 | |
| parent | ad77976e3319afdf41376736cd7f4158fe360e5c (diff) | |
| parent | 6b92e89a1070afb46ae4f74e467b0a2c6e975a7a (diff) | |
Merge "Fix split select tests." into main
| -rw-r--r-- | libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java index 5dff21860ef4..077b35583e04 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java @@ -571,7 +571,8 @@ public class StageCoordinatorTests extends ShellTestCase { } @Test - @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + @DisableFlags({Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, + Flags.FLAG_ENABLE_INPUT_LAYER_TRANSITION_FIX}) public void testRequestEnterSplit_didNotEnterSplitSelect_doesNotApplyTransaction() { final WindowContainerTransaction wct = new WindowContainerTransaction(); mStageCoordinator.registerSplitSelectListener( @@ -585,7 +586,8 @@ public class StageCoordinatorTests extends ShellTestCase { } @Test - @DisableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND) + @DisableFlags({Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND, + Flags.FLAG_ENABLE_INPUT_LAYER_TRANSITION_FIX}) public void testRequestEnterSplit_enteredSplitSelect_appliesTransaction() { final WindowContainerTransaction wct = new WindowContainerTransaction(); mStageCoordinator.registerSplitSelectListener( |