diff options
| author | 2011-04-25 12:36:56 -0700 | |
|---|---|---|
| committer | 2011-04-25 16:04:45 -0700 | |
| commit | af2eb4f6db2b54a144ecd0a87a0321933ffabc2c (patch) | |
| tree | f0c21591637fc78c6faf3c7e2c40ceb1e2050233 | |
| parent | 41f665a5f9d4e73ba8dabceb721c9c8873591bac (diff) | |
Make new networkAttribute parameter non-optional.
Dependencymet sets the default dep-met value for the network. Should
be set to true unless you know what you're doing.
Change-Id: Ifa3765a97615f5333da07bce9defdb8600275129
| -rw-r--r-- | core/java/android/net/NetworkConfig.java | 6 | ||||
| -rwxr-xr-x | core/res/res/values/config.xml | 20 |
2 files changed, 11 insertions, 15 deletions
diff --git a/core/java/android/net/NetworkConfig.java b/core/java/android/net/NetworkConfig.java index 4adb76b8610f..6e774a6f8640 100644 --- a/core/java/android/net/NetworkConfig.java +++ b/core/java/android/net/NetworkConfig.java @@ -60,11 +60,7 @@ public class NetworkConfig { type = Integer.parseInt(fragments[1]); radio = Integer.parseInt(fragments[2]); priority = Integer.parseInt(fragments[3]); - if (fragments.length > 4) { - dependencyMet = Boolean.parseBoolean(fragments[4]); - } else { - dependencyMet = true; - } + dependencyMet = Boolean.parseBoolean(fragments[4]); } /** diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 669529676d7e..d1d81975f8f9 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -131,17 +131,17 @@ 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] --> - <!-- an optional 5th element can be added indicating boot-time dependency-met value. Defaults to true --> + [associated radio-type],[priority],[dependencyMet] --> + <!-- the 5th element indicates boot-time dependency-met value. --> <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_hipri,5,0,3"</item> - <item>"mobile_fota,10,0,2"</item> - <item>"mobile_ims,11,0,2"</item> - <item>"mobile_cbs,12,0,2"</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_hipri,5,0,3,true"</item> + <item>"mobile_fota,10,0,2,true"</item> + <item>"mobile_ims,11,0,2,true"</item> + <item>"mobile_cbs,12,0,2,true"</item> </string-array> <!-- This string array should be overridden by the device to present a list of radio |