diff options
| author | Anton Hansson <hansson@google.com> | 2018-04-18 12:02:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-18 12:02:10 +0000 |
| commit | ea74edc9c5506a061e17654050f38100396e199c (patch) | |
| tree | 87bf5db0f60cb576c66ba3977a28aa4ee76ac011 | |
| parent | e8b70d74223e05ff2724ec8afc2a49d666a56b7f (diff) | |
| parent | 97acc68065d3740b044171af7579eb2f75f56d2a (diff) | |
| download | Settings-android-wear-p-preview-2.tar.gz | |
Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."android-wear-p-preview-2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.0android-n-iot-release-lg-thinq-wk7
| -rw-r--r-- | tests/robotests/Android.mk | 3 | ||||
| -rw-r--r-- | tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk index ae0102feaab..9afd78e1b85 100644 --- a/tests/robotests/Android.mk +++ b/tests/robotests/Android.mk @@ -14,7 +14,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \ junit \ platform-robolectric-prebuilt \ - sdk_vcurrent \ telephony-common LOCAL_INSTRUMENTATION_FOR := Settings @@ -40,4 +39,4 @@ LOCAL_TEST_PACKAGE := Settings LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src -include prebuilts/misc/common/robolectric/run_robotests.mk
\ No newline at end of file +include prebuilts/misc/common/robolectric/run_robotests.mk diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java index f2d1e6534ac..ec35d5c9636 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java @@ -20,7 +20,6 @@ import android.app.Activity; import android.content.Context; import android.os.UserManager; -import android.test.mock.MockContentResolver; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.TestConfig; import com.android.settings.applications.PackageManagerWrapper; @@ -59,7 +58,6 @@ public class ShortcutServicePickerFragmentTest { private PackageManagerWrapper mPackageManager; private ShortcutServicePickerFragment mFragment; - private MockContentResolver mContentResolver; @Before public void setUp() { |