summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-19 11:16:24 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-19 11:16:24 -0700
commitfd38b81dca4fe29071620efacdea4c65f288d3b8 (patch)
tree3fde674c62e46dd8bb5a08f7eb5299a75f7e7c79 /packages
parent02436e51820bbae283830046caf3ed4cde95b5d8 (diff)
parentf313b59b4fd6711c734288badd75c6aa0b57ee6e (diff)
downloadframeworks_base-fd38b81dca4fe29071620efacdea4c65f288d3b8.zip
frameworks_base-fd38b81dca4fe29071620efacdea4c65f288d3b8.tar.gz
frameworks_base-fd38b81dca4fe29071620efacdea4c65f288d3b8.tar.bz2
am f313b59b: Merge change 1957 into donut
Merge commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e' * commit 'f313b59b4fd6711c734288badd75c6aa0b57ee6e': Settings: Disable network location service by default, enable GPS instead.
Diffstat (limited to 'packages')
-rw-r--r--packages/SettingsProvider/res/values/defaults.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index 275ff3a..c283418 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -31,8 +31,11 @@
<bool name="def_bluetooth_on">false</bool>
<bool name="def_install_non_market_apps">false</bool>
- <!-- Comma-separated list of providers. -->
- <string name="def_location_providers_allowed">network</string>
+ <!-- Comma-separated list of location providers.
+ Network location is off by default because it requires
+ user opt-in via Setup Wizard or Settings.
+ -->
+ <string name="def_location_providers_allowed">gps</string>
<!-- 0 == mobile, 1 == wifi. -->
<integer name="def_network_preference">1</integer>
<bool name="def_usb_mass_storage_enabled">true</bool>