diff options
| author | Casey Dahlin <sadmac@google.com> | 2017-10-17 18:20:06 +0000 |
|---|---|---|
| committer | Casey Dahlin <sadmac@google.com> | 2017-10-18 18:20:55 +0000 |
| commit | 0b77c94235a5fa6ba8f09e452a2f770f982934a6 (patch) | |
| tree | ccb8d2e04911747dd88be4466cefbcacf20a2ffb | |
| parent | 499bb0a2a5c96f797c7041ca6ca89f87bb2d178b (diff) | |
| download | cts-0b77c94235a5fa6ba8f09e452a2f770f982934a6.tar.gz | |
Revert "Add UiThreadTest annotation to ActivityKeyboardShortcutsTest"
This reverts commit 499bb0a2a5c96f797c7041ca6ca89f87bb2d178b.
The change was causing regressions for others, and Things was the only
platform hitting the error it fixed. Things will disable this test
instead as keyboard shortcuts aren't important to its usecase.
Bug: b/67766781
Change-Id: I27b00120806136bdfb8acf8937a49b27b15c134b
| -rw-r--r-- | tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java b/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java index 3b6692169cc..7f5c49c0c86 100644 --- a/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java +++ b/tests/app/src/android/app/cts/ActivityKeyboardShortcutsTest.java @@ -19,7 +19,6 @@ package android.app.cts; import android.app.stubs.KeyboardShortcutsActivity; import android.content.pm.PackageManager; import android.test.ActivityInstrumentationTestCase2; -import android.test.UiThreadTest; import android.view.KeyEvent; import android.view.KeyboardShortcutGroup; import android.view.Menu; @@ -52,7 +51,6 @@ public class ActivityKeyboardShortcutsTest * Tests that requestShowKeyboardShortcuts fetches app specific shortcuts even when triggered * from an overflow menu (options menu in the test) */ - @UiThreadTest public void testRequestShowKeyboardShortcuts() throws InterruptedException { if (!keyboardShortcutsSupported()) { return; |