summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorJaikumar Ganesh <jaikumar@google.com>2010-09-14 15:27:47 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-14 15:27:47 -0700
commit4c9a5be4a3749f305ad56fe841e5d07c03c8ac95 (patch)
treecbd884bf493f850f8defc22624322d0957a75986 /core/res
parent22c0a58e7643e86dd2900fde95be812e68a81291 (diff)
parent707952ecd4b6cae25aabcf51f94d702a65847e9e (diff)
downloadframeworks_base-4c9a5be4a3749f305ad56fe841e5d07c03c8ac95.zip
frameworks_base-4c9a5be4a3749f305ad56fe841e5d07c03c8ac95.tar.gz
frameworks_base-4c9a5be4a3749f305ad56fe841e5d07c03c8ac95.tar.bz2
Merge "Rework Bluetooth tethering networking configuration."
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/config.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index ac5828f..c5486e3 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -131,6 +131,10 @@
<string-array translatable="false" name="config_tether_bluetooth_regexs">
</string-array>
+ <!-- Max number of Bluetooth tethering connections allowed. If this is
+ updated config_tether_dhcp_range has to be updated appropriately. -->
+ <integer translateable="false" name="config_max_pan_devices">5</integer>
+
<!-- Dhcp range (min, max) to use for tethering purposes -->
<string-array translatable="false" name="config_tether_dhcp_range">
</string-array>