Merge "[location] system_server should not call non forUser Settings.Secure.get* methods"

1 files changed, 6 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/location/util/SystemSettingsHelper.java b/services/core/java/com/android/server/location/util/SystemSettingsHelper.java
index ff4ba914cb9c..39aeaba16579 100644
--- a/services/core/java/com/android/server/location/util/SystemSettingsHelper.java
+++ b/services/core/java/com/android/server/location/util/SystemSettingsHelper.java
@@ -29,6 +29,7 @@ import static com.android.server.location.LocationManagerService.D;
 import static com.android.server.location.LocationManagerService.TAG;
 
 import android.app.ActivityManager;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.net.Uri;
@@ -330,11 +331,13 @@ public class SystemSettingsHelper extends SettingsHelper {
     @Override
     public float getCoarseLocationAccuracyM() {
         long identity = Binder.clearCallingIdentity();
+        final ContentResolver cr = mContext.getContentResolver();
         try {
-            return Settings.Secure.getFloat(
-                    mContext.getContentResolver(),
+            return Settings.Secure.getFloatForUser(
+                    cr,
                     LOCATION_COARSE_ACCURACY_M,
-                    DEFAULT_COARSE_LOCATION_ACCURACY_M);
+                    DEFAULT_COARSE_LOCATION_ACCURACY_M,
+                    cr.getUserId());
         } finally {
             Binder.restoreCallingIdentity(identity);
         }