Merge "Making it clear that a test sees the keyguard for the first time." into udc-dev
diff --git a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
index cefba16..3141c7b 100644
--- a/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
+++ b/tests/src/com/android/launcher3/ui/AbstractLauncherUiTest.java
@@ -240,11 +240,16 @@
public void setUp() throws Exception {
mLauncher.onTestStart();
+ final boolean keyguardAlreadyVisible = sSeenKeygard;
+
sSeenKeygard = sSeenKeygard
|| !TestHelpers.wait(
Until.gone(By.res(SYSTEMUI_PACKAGE, "keyguard_status_view")), 60000);
- Assert.assertFalse("Keyguard is visible, which is likely caused by a crash in SysUI",
+ Assert.assertFalse(
+ "Keyguard is visible, which is likely caused by a crash in SysUI, seeing keyguard"
+ + " for the first time = "
+ + !keyguardAlreadyVisible,
sSeenKeygard);
final String launcherPackageName = mDevice.getLauncherPackageName();