aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 08:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing temporary workarounds to make tests pass on Cuttlefish

Browse Source 
Bug: 136278866
Change-Id: Ie537a578bb871921c0cbea1f197261e703de98f5
This commit is contained in:
vadimt
2019-12-12 18:15:48 -08:00
parent a11ff18d6b
commit 08eca2fa2e
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
View File

@@ -92,7 +92,7 @@ public abstract class AbstractLauncherUiTest {
public static final long DEFAULT_ACTIVITY_TIMEOUT = TimeUnit.SECONDS.toMillis(10);
public static final long DEFAULT_BROADCAST_TIMEOUT_SECS = 5;
public static final long DEFAULT_UI_TIMEOUT = 60000; // b/136278866
public static final long DEFAULT_UI_TIMEOUT = 10000;
private static final String TAG = "AbstractLauncherUiTest";
protected LooperExecutor mMainThreadExecutor = MAIN_EXECUTOR;

6
tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java
View File

@@ -429,12 +429,6 @@ public final class LauncherInstrumentation {
assertEquals("Unexpected display rotation",
mExpectedRotation, mDevice.getDisplayRotation());
// b/136278866
for (int i = 0; i != 100; ++i) {
if (getNavigationModeMismatchError() == null) break;
sleep(100);
}
final String error = getNavigationModeMismatchError();
assertTrue(error, error == null);
log("verifyContainerType: " + containerType);