Merge "EmergencyInfo: Remove direct dep on sdk_vcurrent module."
diff --git a/tests/robolectric/Android.mk b/tests/robolectric/Android.mk
index 95dc47d..c450a42 100644
--- a/tests/robolectric/Android.mk
+++ b/tests/robolectric/Android.mk
@@ -19,8 +19,7 @@
LOCAL_JAVA_LIBRARIES := \
junit \
- platform-robolectric-prebuilt \
- sdk_vcurrent
+ platform-robolectric-prebuilt
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v7-preference \
diff --git a/tests/robolectric/src/com/android/emergency/EmergencySearchIndexablesProviderTest.java b/tests/robolectric/src/com/android/emergency/EmergencySearchIndexablesProviderTest.java
index 51cf592..7989230 100644
--- a/tests/robolectric/src/com/android/emergency/EmergencySearchIndexablesProviderTest.java
+++ b/tests/robolectric/src/com/android/emergency/EmergencySearchIndexablesProviderTest.java
@@ -19,7 +19,6 @@
import android.database.Cursor;
import android.provider.SearchIndexablesContract;
-import android.test.suitebuilder.annotation.SmallTest;
import com.android.emergency.R;
import com.android.emergency.TestConfig;
@@ -34,7 +33,6 @@
import org.robolectric.annotation.Config;
/** Unit tests for {@link EmergencySearchIndexablesProvider}. */
-@SmallTest
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class EmergencySearchIndexablesProviderTest {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java b/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java
index 7a039e4..a1f9a07 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/ContactPreferencesTest.java
@@ -32,7 +32,6 @@
import android.net.Uri;
import android.os.Looper;
import android.provider.ContactsContract;
-import android.test.suitebuilder.annotation.SmallTest;
import com.android.emergency.ContactTestUtils;
import com.android.emergency.EmergencyContactManager;
@@ -53,7 +52,6 @@
import org.robolectric.annotation.Config;
/** Unit tests for {@link ContactPreferences}. */
-@SmallTest
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class ContactPreferencesTest {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
index 6cc07c0..caddd12 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyContactsPreferenceTest.java
@@ -32,7 +32,6 @@
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
-import android.test.suitebuilder.annotation.SmallTest;
import com.android.emergency.ContactTestUtils;
import com.android.emergency.EmergencyContactManager;
@@ -52,7 +51,6 @@
import org.robolectric.annotation.Config;
/** Unit tests for {@link EmergencyContactsPreference}. */
-@SmallTest
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EmergencyContactsPreferenceTest {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
index 14e7a96..c7fd3bc 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyEditTextPreferenceTest.java
@@ -26,7 +26,6 @@
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
-import android.test.suitebuilder.annotation.SmallTest;
import com.android.emergency.PreferenceKeys;
import com.android.emergency.TestConfig;
@@ -41,7 +40,6 @@
import org.robolectric.annotation.Config;
/** Unit tests for {@link EmergencyEditTextPreference}. */
-@SmallTest
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class EmergencyEditTextPreferenceTest {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
index 124d569..4712a2a 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/EmergencyListPreferenceTest.java
@@ -21,14 +21,11 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import android.test.suitebuilder.annotation.SmallTest;
-
import android.content.Context;
import android.content.SharedPreferences;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
-import android.test.suitebuilder.annotation.SmallTest;
import android.text.TextUtils;
import com.android.emergency.PreferenceKeys;
@@ -47,7 +44,6 @@
import org.robolectric.annotation.Config;
/** Unit tests for {@link EmergencyListPreference}. */
-@SmallTest
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class EmergencyListPreferenceTest {
diff --git a/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java b/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
index e5b85c5..0549154 100644
--- a/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
+++ b/tests/robolectric/src/com/android/emergency/preferences/NameAutoCompletePreferenceTest.java
@@ -26,7 +26,6 @@
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen;
-import android.test.suitebuilder.annotation.SmallTest;
import android.widget.AutoCompleteTextView;
import com.android.emergency.PreferenceKeys;
@@ -42,7 +41,6 @@
import org.robolectric.annotation.Config;
/** Unit tests for {@link NameAutoCompletePreference}. */
-@SmallTest
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class NameAutoCompletePreferenceTest {
diff --git a/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java b/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java
index a467372..eaa5a13 100644
--- a/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java
+++ b/tests/robolectric/src/com/android/emergency/util/PreferenceUtilsTest.java
@@ -31,7 +31,6 @@
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
-import android.test.suitebuilder.annotation.SmallTest;
import com.android.emergency.ContactTestUtils;
import com.android.emergency.PreferenceKeys;
@@ -47,7 +46,6 @@
import org.robolectric.annotation.Config;
/** Unit tests for {@link PreferenceUtils}. */
-@SmallTest
@RunWith(RobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public final class PreferenceUtilsTest {
