OSDN Git Service

Remove wrapper for LocationManager
authorhjchangliao <hjchangliao@google.com>
Fri, 27 Apr 2018 03:27:46 +0000 (11:27 +0800)
committerHJ ChangLiao <hjchangliao@google.com>
Fri, 27 Apr 2018 03:32:04 +0000 (03:32 +0000)
Remove LocationManagerWrapper from SettingsLib

Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I4ee5de7f6a59468e35ab0bfa2845022b7d7efb3a

tests/robotests/src/com/android/settings/location/LocationEnablerTest.java

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