Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ef568c97: Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE

Browse Source 
* commit 'ef568c97b5962249cbab7995f76435492a10ba68':
  Make new networkAttribute parameter non-optional.
This commit is contained in:
Robert Greenwalt
2011-04-26 00:23:03 -07:00
committed by Android Git Automerger
parent 9d5ac7bd8a ef568c97b5
commit 759efacd2d
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/NetworkConfig.java
View File

@@ -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]);
}
/**

20
core/res/res/values/config.xml
View File

@@ -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