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

Merge "Insert a check that keyguard is invisible into waitForLauncherCondition" into udc-dev am: db7009544e am: 03d0cd83a9

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

Change-Id: Ib4549e9712251a6c9eb85dfb5229d2d7addc4482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-31 21:26:42 +00:00
committed by Automerger Merge Worker
parent 8d55e5076a 03d0cd83a9
commit f95fca0f5d
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -232,17 +232,7 @@ public abstract class AbstractLauncherUiTest {
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, seeing keyguard"
+ " for the first time = "
+ !keyguardAlreadyVisible,
sSeenKeygard);
verifyKeyguardInvisible();
final String launcherPackageName = mDevice.getLauncherPackageName();
try {
@@ -275,6 +265,20 @@ public abstract class AbstractLauncherUiTest {
}
}
private static void verifyKeyguardInvisible() {
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, seeing keyguard"
+ " for the first time = "
+ !keyguardAlreadyVisible,
sSeenKeygard);
}
@After
public void verifyLauncherState() {
try {
@@ -392,6 +396,7 @@ public abstract class AbstractLauncherUiTest {
// flakiness.
protected void waitForLauncherCondition(
String message, Function<Launcher, Boolean> condition, long timeout) {
verifyKeyguardInvisible();
if (!TestHelpers.isInLauncherProcess()) return;
Wait.atMost(message, () -> getFromLauncher(condition), timeout, mLauncher);
}