summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-06-03 12:38:59 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2011-06-17 17:26:13 -0700
commit39354845be78fd5d74bec3916355a518ebfbd506 (patch)
tree6f2fc359d841d3fa2bf5e4ab1732bd6be9e75d67
parent342dd72210cbbe8297df767f30cf22b5df69faaa (diff)
downloaddevice_samsung_crespo-39354845be78fd5d74bec3916355a518ebfbd506.zip
device_samsung_crespo-39354845be78fd5d74bec3916355a518ebfbd506.tar.gz
device_samsung_crespo-39354845be78fd5d74bec3916355a518ebfbd506.tar.bz2
Fix Tethering configuration
The old scheme was too imprecise. bug:4530116 Change-Id: I0f172cbe023226731d5011c3564c7006e153edba
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml19
1 files changed, 9 insertions, 10 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 05ca381..9680997 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -135,12 +135,15 @@
<item>"usb0"</item>
</string-array>
- <!-- Regex array of allowable upstream ifaces for tethering - for example if you want
- tethering on a new interface called "foo2" add <item>"foo\\d"</item> to the array -->
- <string-array translatable="false" name="config_tether_upstream_regexs">
- <item>"rmnet\\d"</item>
- <item>"eth\\d"</item>
- </string-array>
+ <!-- Array of allowable ConnectivityManager network types for tethering -->
+ <!-- Common options are [1, 4] for wifi and dun or [0,1,5,7] for -->
+ <!-- mobile, wifi, hipri and bluetooth -->
+ <integer-array translatable="false" name="config_tether_upstream_types">
+ <item>0</item>
+ <item>1</item>
+ <item>5</item>
+ <item>7</item>
+ </integer-array>
<!-- List of regexpressions describing the interface (if any) that represent tetherable
Wifi interfaces. If the device doesn't want to support tethering over Wifi this
@@ -149,10 +152,6 @@
<item>"wl0.1"</item>
</string-array>
-
- <!-- Boolean indicating if we require the use of DUN on mobile for tethering -->
- <bool translatable="false" name="config_tether_dun_required">false</bool>
-
<!-- Vibrator pattern for a very short but reliable vibration for soft keyboard tap -->
<integer-array name="config_keyboardTapVibePattern">
<item>30</item>