diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-04 12:47:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-04 12:47:24 -0700 |
| commit | 176981834c80d50fbb931d297cf6d9bf1157e6da (patch) | |
| tree | 676dbded0aeda4754544bdc1e8df85b405313e24 /overlay | |
| parent | 55c58198c8113ff865d4b870a4f600c2f3e4e53d (diff) | |
| parent | aed6b2f969236c539be3508ee092edde82d0bedf (diff) | |
| download | device_samsung_crespo-176981834c80d50fbb931d297cf6d9bf1157e6da.zip device_samsung_crespo-176981834c80d50fbb931d297cf6d9bf1157e6da.tar.gz device_samsung_crespo-176981834c80d50fbb931d297cf6d9bf1157e6da.tar.bz2 | |
am aed6b2f9: am 37db9402: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE
* commit 'aed6b2f969236c539be3508ee092edde82d0bedf':
Add auto-restore timeout for secondary networks.
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/frameworks/base/core/res/res/values/config.xml | 18 |
1 files changed, 11 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 d61dd5a..05ca381 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -114,14 +114,18 @@ 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],[dependency-met] --> + [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet] --> + <!-- the 5th element "resore-time" indicates the number of milliseconds to delay + before automatically restore the default connection. Set -1 if the connection + does not require auto-restore. --> + <!-- the 6th element indicates boot-time dependency-met value. --> <string-array translatable="false" name="networkAttributes"> - <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> + <item>"wifi,1,1,1,-1,true"</item> + <item>"mobile,0,0,0,-1,true"</item> + <item>"mobile_mms,2,0,2,60000,true"</item> + <item>"mobile_supl,3,0,2,60000,true"</item> + <item>"mobile_dun,4,0,4,60000,true"</item> + <item>"mobile_hipri,5,0,3,60000,true"</item> </string-array> <!-- List of regexpressions describing the interface (if any) that represent tetherable |