diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-11 00:06:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-11 00:06:26 +0000 |
| commit | 675713233207158a667060258276d6c86435bcf2 (patch) | |
| tree | a06170f4307643121d17e82572f18feca6d31708 /location | |
| parent | 245a76e40511d9a2ae3a77bf1c3feba037f559d4 (diff) | |
| parent | 270296da8331197f49017688c2be860e7d1a920a (diff) | |
Merge "LocationManager: move impl of setLocationEnabledForUser to server"
Diffstat (limited to 'location')
| -rw-r--r-- | location/java/android/location/ILocationManager.aidl | 1 | ||||
| -rw-r--r-- | location/java/android/location/LocationManager.java | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/location/java/android/location/ILocationManager.aidl b/location/java/android/location/ILocationManager.aidl index 030f80a54db9..a99e68fbb7b6 100644 --- a/location/java/android/location/ILocationManager.aidl +++ b/location/java/android/location/ILocationManager.aidl @@ -110,6 +110,7 @@ interface ILocationManager boolean isProviderEnabledForUser(String provider, int userId); boolean isLocationEnabledForUser(int userId); + void setLocationEnabledForUser(boolean enabled, int userId); void addTestProvider(String name, in ProviderProperties properties, String opPackageName); void removeTestProvider(String provider, String opPackageName); void setTestProviderLocation(String provider, in Location loc, String opPackageName); diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 8afdb7d370d9..8ae967fe79c2 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -478,13 +478,11 @@ public class LocationManager { @TestApi @RequiresPermission(WRITE_SECURE_SETTINGS) public void setLocationEnabledForUser(boolean enabled, @NonNull UserHandle userHandle) { - Settings.Secure.putIntForUser( - mContext.getContentResolver(), - Settings.Secure.LOCATION_MODE, - enabled - ? Settings.Secure.LOCATION_MODE_ON - : Settings.Secure.LOCATION_MODE_OFF, - userHandle.getIdentifier()); + try { + mService.setLocationEnabledForUser(enabled, userHandle.getIdentifier()); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } } /** |