Merge "Skips AccessibilityShortcutChooserActivity on watch." into main (dbbe3311) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutChooserActivityTest.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import static com.google.common.truth.Truth.assertThat;

		import static org.hamcrest.Matchers.allOf;
		import static org.hamcrest.Matchers.endsWith;
		import static org.junit.Assume.assumeFalse;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.ArgumentMatchers.anyString;
		@@ -119,6 +120,11 @@ public class AccessibilityShortcutChooserActivityTest {

		@Before
		public void setUp() throws Exception {
		final PackageManager pm =
		InstrumentationRegistry.getInstrumentation().getContext().getPackageManager();
		assumeFalse("AccessibilityShortcutChooserActivity not supported on watch",
		pm.hasSystemFeature(PackageManager.FEATURE_WATCH));

		mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
		mDevice.wakeUp();
		when(mAccessibilityServiceInfo.getResolveInfo()).thenReturn(mResolveInfo);
		@@ -138,8 +144,10 @@ public class AccessibilityShortcutChooserActivityTest {

		@After
		public void cleanUp() {
		if (mScenario != null) {
		mScenario.close();
		}
		}

		@Test
		public void doubleClickTestServiceAndClickDenyButton_permissionDialogDoesNotExist() {