Merge "Remove deprecated Settings APIs."

2019-03-14 17:06:04 +00:00
parent 7e7a8efd5f 6dac9d1bf5
commit 9c5458edb7
5 changed files with 17 additions and 81 deletions
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -1360,10 +1360,10 @@ public class LocationManager {
            @NonNull String provider, boolean enabled, @NonNull UserHandle userHandle) {
        checkProvider(provider);

-        return Settings.Secure.setLocationProviderEnabledForUser(
+        return Settings.Secure.putStringForUser(
                mContext.getContentResolver(),
-                provider,
-                enabled,
+                Settings.Secure.LOCATION_PROVIDERS_ALLOWED,
+                (enabled ? "+" : "-") + provider,
                userHandle.getIdentifier());
    }