Remove wrapper for LocationManager

Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I4ee5de7f6a59468e35ab0bfa2845022b7d7efb3a
This commit is contained in:
hjchangliao
2018-04-27 11:27:46 +08:00
committed by HJ ChangLiao
parent e0b3323bde
commit 6bc467a252

View File

@@ -43,7 +43,6 @@ import android.text.TextUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.wrapper.LocationManagerWrapper;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -62,7 +61,7 @@ import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = { @Config(shadows = {
ShadowSecureSettings.class, ShadowSecureSettings.class,
LocationEnablerTest.ShadowLocationManagerWrapper.class}) LocationEnablerTest.ShadowLocationManager.class})
public class LocationEnablerTest { public class LocationEnablerTest {
@Mock @Mock
@@ -272,8 +271,8 @@ public class LocationEnablerTest {
return intent -> TextUtils.equals(expected, intent.getAction()); return intent -> TextUtils.equals(expected, intent.getAction());
} }
@Implements(value = LocationManagerWrapper.class) @Implements(value = LocationManager.class)
public static class ShadowLocationManagerWrapper { public static class ShadowLocationManager {
@Implementation @Implementation
public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) { public void setLocationEnabledForUser(boolean enabled, UserHandle userHandle) {