From dad115e2dbf79248464c249ce7293f1b302ddaf1 Mon Sep 17 00:00:00 2001 From: Tom O'Neill Date: Tue, 4 Mar 2014 10:59:29 -0800 Subject: [PATCH] Remove some usages of deprecated location APIs Bug: 13302202 Change-Id: I916568d2b310eaf9a8b30da9a9980344aaf76c21 --- src/com/android/settings/users/RestrictionUtils.java | 4 ++-- src/com/android/settings/users/UserSettings.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java index 3ee6d510f06..e8d46e9f67b 100644 --- a/src/com/android/settings/users/RestrictionUtils.java +++ b/src/com/android/settings/users/RestrictionUtils.java @@ -84,8 +84,8 @@ public class RestrictionUtils { userRestrictions.putBoolean(entry.getKey(), !entry.getSelectedState()); if (entry.getKey().equals(UserManager.DISALLOW_SHARE_LOCATION) && !entry.getSelectedState()) { - Secure.putStringForUser(context.getContentResolver(), - Secure.LOCATION_PROVIDERS_ALLOWED, "", user.getIdentifier()); + Secure.putIntForUser(context.getContentResolver(), + Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, user.getIdentifier()); } } um.setUserRestrictions(userRestrictions, user); diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 849ab946f27..1a60e782b56 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -345,8 +345,8 @@ public class UserSettings extends RestrictedSettingsFragment UserHandle user = new UserHandle(userId); mUserManager.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user); mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true, user); - Secure.putStringForUser(getContentResolver(), - Secure.LOCATION_PROVIDERS_ALLOWED, "", userId); + Secure.putIntForUser(getContentResolver(), + Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF, userId); Bitmap bitmap = BitmapFactory.decodeResource(getResources(), UserSettings.USER_DRAWABLES[ userId % UserSettings.USER_DRAWABLES.length]);