commit 60379ac052f7d40e99a41a88cbf1c3f7acdb411d
author David Saff <saff@google.com> Thu Feb 01 00:15:39 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 01 00:15:39 2024 +0000
tree fd411c429e3bbe25c6cac9e714056ddea8b28311
parent bb28770a01a1810bff7775b31e302bc098f5e6c2
parent 1121f8b5b954fe2c65b64acf217ad51853799de3

Merge "Assert keyguard gone at beginning and end of PortraitLandscapeRunner" into main

tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java

diff --git a/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java b/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
index 3a54915..8eebdb2 100644
--- a/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
+++ b/tests/multivalentTests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
@@ -44,7 +44,9 @@
             @Override
             public void evaluate() throws Throwable {
                 try {
+                    // we expect to begin unlocked...
                     AbstractLauncherUiTest.verifyKeyguardInvisible();
+
                     mTest.mDevice.pressHome();
                     mTest.waitForLauncherCondition("Launcher activity wasn't created",
                             launcher -> launcher != null);
@@ -67,6 +69,9 @@
                         }
                     });
                     mTest.mLauncher.setExpectedRotation(Surface.ROTATION_0);
+
+                    // and end unlocked...
+                    AbstractLauncherUiTest.verifyKeyguardInvisible();
                 }
             }