diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-06-06 12:10:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-06 12:10:00 -0700 |
| commit | 9c4ed1394bb16b1d76758127a9b5d73bd363adaf (patch) | |
| tree | 3f7f3f36ce1efa79e9072d312220e5ae2066ad71 /core/res | |
| parent | fae5cb2b356a1fef172b43066180a7ab4c32dbac (diff) | |
| parent | f9610b3842e030138c1dc327a3a467aaea02c227 (diff) | |
| download | frameworks_base-9c4ed1394bb16b1d76758127a9b5d73bd363adaf.zip frameworks_base-9c4ed1394bb16b1d76758127a9b5d73bd363adaf.tar.gz frameworks_base-9c4ed1394bb16b1d76758127a9b5d73bd363adaf.tar.bz2 | |
am f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken
* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/config.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index cd47ae9..1946388 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -91,8 +91,18 @@ <string-array translatable="false" name="config_tether_upstream_regexs"> </string-array> - <!-- Boolean indicating if we require the use of DUN on mobile for tethering --> - <bool translatable="false" name="config_tether_dun_required">true</bool> + <!-- Boolean indicating if we require the use of DUN on mobile for tethering. + Note that this defaults to false so that if you move to a carrier that + hasn't configured anything tethering will still work. If you'd rather + make the device untetherable on unconfigured devices, set to true --> + <bool translatable="false" name="config_tether_dun_required">false</bool> + + <!-- String containing the apn value for tethering. May be overriden by secure settings + TETHER_DUN_APN. Value is a comma separated series of strings: + "name,apn,proxy,port,username,password,server,mmsc,mmsproxy,mmsport,mcc,mnc,auth,type" + note that empty fields can be ommitted: "name,apn,,,,,,,,,310,260,,DUN" --> + <string translatable="false" name="config_tether_apndata"></string> + <!-- Flag indicating whether the keyguard should be bypassed when the slider is open. This can be set or unset depending how easily |