diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-09-11 16:02:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-11 16:02:45 +0000 |
| commit | c889315c66bdf6b1f39f78b6983241d25b3accb1 (patch) | |
| tree | 9c5473d7e94a7be3e97595d5796b69c72ef00819 /core/java/android/provider | |
| parent | 118346a4ff1b324f9f5ce674ebf5dda99b4bd248 (diff) | |
| parent | d86734b4695a92359ed38d6053ed1ce16a470634 (diff) | |
| download | frameworks_base-c889315c66bdf6b1f39f78b6983241d25b3accb1.zip frameworks_base-c889315c66bdf6b1f39f78b6983241d25b3accb1.tar.gz frameworks_base-c889315c66bdf6b1f39f78b6983241d25b3accb1.tar.bz2 | |
am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev
* commit '086bf8e1ef3beac49adea005a1e3275605cd4a41':
Allow device owners to update LOCATION_MODE.
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 01fda47..440b1ec 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3150,6 +3150,11 @@ public final class Settings { /** @hide */ public static boolean putStringForUser(ContentResolver resolver, String name, String value, int userHandle) { + if (LOCATION_MODE.equals(name)) { + // HACK ALERT: temporary hack to work around b/10491283. + // TODO: once b/10491283 fixed, remove this hack + return setLocationModeForUser(resolver, Integer.parseInt(value), userHandle); + } if (MOVED_TO_GLOBAL.contains(name)) { Log.w(TAG, "Setting " + name + " has moved from android.provider.Settings.System" + " to android.provider.Settings.Global"); @@ -3265,11 +3270,6 @@ public final class Settings { /** @hide */ public static boolean putIntForUser(ContentResolver cr, String name, int value, int userHandle) { - if (LOCATION_MODE.equals(name)) { - // HACK ALERT: temporary hack to work around b/10491283. - // TODO: once b/10491283 fixed, remove this hack - return setLocationModeForUser(cr, value, userHandle); - } return putStringForUser(cr, name, Integer.toString(value), userHandle); } |