Require status bar for CTS#testInjectToStatusBar()
Test: atest WindowInputTests
Fix: 161527204
Bug: 162043335
Change-Id: Ib5b822ae4b9556a9bc21b613c49787121347d21d
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInputTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInputTests.java
index df49664..ce0a51e 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInputTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInputTests.java
@@ -17,6 +17,7 @@
package android.server.wm;
import static android.server.wm.ActivityManagerTestBase.launchHomeActivityNoWait;
+import static android.server.wm.BarTestUtils.assumeHasStatusBar;
import static android.server.wm.UiDeviceUtils.pressUnlockButton;
import static android.server.wm.UiDeviceUtils.pressWakeupButton;
import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
@@ -239,6 +240,7 @@
@Test
public void testInjectToStatusBar() {
// Try to inject event to status bar.
+ assumeHasStatusBar(mActivityRule);
final long downTime = SystemClock.uptimeMillis();
final MotionEvent eventHover = MotionEvent.obtain(
downTime, downTime, MotionEvent.ACTION_HOVER_MOVE, 0, 0, 0);
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/BarTestUtils.java b/tests/framework/base/windowmanager/util/src/android/server/wm/BarTestUtils.java
index 21002a4..be66641 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/BarTestUtils.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/BarTestUtils.java
@@ -45,7 +45,10 @@
public static void assumeHasColoredStatusBar(ActivityTestRule<?> rule) {
assumeHasColoredBars();
+ assumeHasStatusBar(rule);
+ }
+ public static void assumeHasStatusBar(ActivityTestRule<?> rule) {
assumeFalse("No status bar when running in VR", isRunningInVr());
assumeTrue("Top stable inset is non-positive, no status bar.",
