Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb64305a authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module." 

am: ea74edc9

Change-Id: I79d97720c6b4e5f773644d686b06acc9f3e8840d
parents 47e671e1 ea74edc9

tests/robotests/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
LOCAL_JAVA_LIBRARIES := \

    junit \

    platform-robolectric-prebuilt \

    sdk_vcurrent \

    telephony-common



LOCAL_INSTRUMENTATION_FOR := Settings

tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java

+0 −2
Original line number Diff line number Diff line
@@ -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() {