PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ea74edc9c5

Change-Id: I79d97720c6b4e5f773644d686b06acc9f3e8840d
This commit is contained in:
Anton Hansson
2018-04-18 05:24:47 -07:00
committed by android-build-merger
parent 47e671e148 ea74edc9c5
commit cb64305ad3
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/robotests/Android.mk
View File

@@ -14,7 +14,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
junit \ junit \
platform-robolectric-prebuilt \ platform-robolectric-prebuilt \
sdk_vcurrent \
telephony-common telephony-common
LOCAL_INSTRUMENTATION_FOR := Settings LOCAL_INSTRUMENTATION_FOR := Settings

2
tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
View File

@@ -20,7 +20,6 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.os.UserManager; import android.os.UserManager;
import android.test.mock.MockContentResolver;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.applications.PackageManagerWrapper; import com.android.settings.applications.PackageManagerWrapper;
@@ -59,7 +58,6 @@ public class ShortcutServicePickerFragmentTest {
private PackageManagerWrapper mPackageManager; private PackageManagerWrapper mPackageManager;
private ShortcutServicePickerFragment mFragment; private ShortcutServicePickerFragment mFragment;
private MockContentResolver mContentResolver;
@Before @Before
public void setUp() { public void setUp() {