diff --git a/core/java/android/net/NetworkConfig.java b/core/java/android/net/NetworkConfig.java index 4adb76b8610fb..6e774a6f86409 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 669529676d7ed..d1d81975f8f94 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 --> - + [associated radio-type],[priority],[dependencyMet] --> + - "wifi,1,1,1" - "mobile,0,0,0" - "mobile_mms,2,0,2" - "mobile_supl,3,0,2" - "mobile_hipri,5,0,3" - "mobile_fota,10,0,2" - "mobile_ims,11,0,2" - "mobile_cbs,12,0,2" + "wifi,1,1,1,true" + "mobile,0,0,0,true" + "mobile_mms,2,0,2,true" + "mobile_supl,3,0,2,true" + "mobile_hipri,5,0,3,true" + "mobile_fota,10,0,2,true" + "mobile_ims,11,0,2,true" + "mobile_cbs,12,0,2,true"