summaryrefslogtreecommitdiffstats
path: root/overlay
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-04-26 01:34:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-26 01:34:45 -0700
commit2e5d6d35e77b612e6280cd5e8740056ddf632f2b (patch)
treefb58280af14e08b5e5bd3be6c3d51a57b584837c /overlay
parentceec0c1e09eb89da87f3fd7a7e265fbea3f876d3 (diff)
parent1fd11e965e3ccb7e66ce77bbc74f0e516d44c262 (diff)
downloaddevice_samsung_crespo-2e5d6d35e77b612e6280cd5e8740056ddf632f2b.zip
device_samsung_crespo-2e5d6d35e77b612e6280cd5e8740056ddf632f2b.tar.gz
device_samsung_crespo-2e5d6d35e77b612e6280cd5e8740056ddf632f2b.tar.bz2
am 1fd11e96: am 803a9aaf: Add new networkAttribute parameter.
* commit '1fd11e965e3ccb7e66ce77bbc74f0e516d44c262': Add new networkAttribute parameter.
Diffstat (limited to 'overlay')
-rw-r--r--overlay/frameworks/base/core/res/res/values/config.xml14
1 files changed, 7 insertions, 7 deletions
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 05090fd..d61dd5a 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -114,14 +114,14 @@
attributes. This is used by the connectivity manager to decide which networks can coexist
based on the hardware -->
<!-- An Array of "[Connection name],[ConnectivityManager connection type],
- [associated radio-type],[priority] -->
+ [associated radio-type],[priority],[dependency-met] -->
<string-array translatable="false" name="networkAttributes">
- <item>"wifi,1,1,1"</item>
- <item>"mobile,0,0,0"</item>
- <item>"mobile_mms,2,0,2"</item>
- <item>"mobile_supl,3,0,2"</item>
- <item>"mobile_dun,4,0,4"</item>
- <item>"mobile_hipri,5,0,3"</item>
+ <item>"wifi,1,1,1,true"</item>
+ <item>"mobile,0,0,0,true"</item>
+ <item>"mobile_mms,2,0,2,true"</item>
+ <item>"mobile_supl,3,0,2,true"</item>
+ <item>"mobile_dun,4,0,4,true"</item>
+ <item>"mobile_hipri,5,0,3,true"</item>
</string-array>
<!-- List of regexpressions describing the interface (if any) that represent tetherable