From 1454947ad21409af777a7d2eca32bf6a2d62fa9a Mon Sep 17 00:00:00 2001
From: Issei Suzuki <issei@google.com>
Date: Fri, 8 Jul 2022 12:45:39 +0000
Subject: [PATCH] Disable AppTransitionControllerTest when WM Shell is enabled.

AppTransitionController is only used by the legacy app transition, so we
don't need to test them when WM Shell is enabled.

Bug: 238374474
Test: atest AppTransitionControllerTest
Change-Id: I8d9ff3f7583f74583fc7db59c6913eb35a6cd757
---
 .../src/com/android/server/wm/AppTransitionControllerTest.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java
index 8656a4fecef17..b00002166f390 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java
@@ -47,6 +47,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.clearInvocations;
@@ -89,6 +90,7 @@ public class AppTransitionControllerTest extends WindowTestsBase {
 
     @Before
     public void setUp() throws Exception {
+        assumeFalse(WindowManagerService.sEnableShellTransitions);
         mAppTransitionController = new AppTransitionController(mWm, mDisplayContent);
     }