From 6bc467a252d503d96b17abb8602e89bf17c0850c Mon Sep 17 00:00:00 2001 From: hjchangliao Date: Fri, 27 Apr 2018 11:27:46 +0800 Subject: [PATCH] Remove wrapper for LocationManager Remove LocationManagerWrapper from SettingsLib Bug: 76167422 Test: RunSettingsRoboTests Change-Id: I4ee5de7f6a59468e35ab0bfa2845022b7d7efb3a --- .../src/com/android/settings/location/LocationEnablerTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index 43367fe9a1..10a313f65e 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -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) { -- 2.11.0