From c353b1adb280f986c20b55953b90c32c12df7076 Mon Sep 17 00:00:00 2001 From: vadimt Date: Wed, 11 Aug 2021 14:47:05 -0700 Subject: [PATCH] Removing old workaround Bug: 139137636 Test: presubmit Change-Id: Iaa307c3d58f76ab7ee3b0a4a4a364b2b97d0efb7 --- .../android/quickstep/NavigationModeSwitchRule.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java index 67840d1a9e..bc8602c940 100644 --- a/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java +++ b/quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java @@ -49,6 +49,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; /** * Test rule that allows executing a test with Quickstep on and then Quickstep off. @@ -182,17 +183,12 @@ public class NavigationModeSwitchRule implements TestRule { }; targetContext.getMainExecutor().execute(() -> SYS_UI_NAVIGATION_MODE.addModeChangeListener(listener)); - // b/139137636 -// latch.await(60, TimeUnit.SECONDS); + latch.await(60, TimeUnit.SECONDS); targetContext.getMainExecutor().execute(() -> SYS_UI_NAVIGATION_MODE.removeModeChangeListener(listener)); - Wait.atMost(() -> "Navigation mode didn't change to " + expectedMode, - () -> currentSysUiNavigationMode() == expectedMode, WAIT_TIME_MS, - launcher); - // b/139137636 -// assertTrue(launcher, "Navigation mode didn't change to " + expectedMode, -// currentSysUiNavigationMode() == expectedMode, description); + assertTrue(launcher, "Navigation mode didn't change to " + expectedMode, + currentSysUiNavigationMode() == expectedMode, description); }