PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing old workaround" into sc-v2-dev am: e22e3aaa9a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15534469

Change-Id: Ie05de12b6a74e7cb7f0582791d264ae2557031dd
This commit is contained in:
TreeHugger Robot
2021-08-16 07:01:19 +00:00
committed by Automerger Merge Worker
parent 33120900b8 e22e3aaa9a
commit e46b0caee1
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/tests/src/com/android/quickstep/NavigationModeSwitchRule.java
+4 -8
View File
@@ -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);
}