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

BUG: 166312046
Test: builds
Change-Id: I0bee63739ed2024ccd3f80738adedcd636790c6c
This commit is contained in:
Songchun Fan
2020-09-03 16:18:22 -07:00
parent c634b35bf4
commit 669fc441b6

View File

@@ -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);
}