LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add network type TYPE_MOBILE_IA.

Browse Source 
Add a network type for establishing connections to the apn used for
the initial connection.

Enable some debug for now.

Bug: 8733613
Change-Id: Ia627ac0cf5715660b6d02bb13a83d46ec1727b87
This commit is contained in:
Wink Saville
2013-07-29 15:00:57 -07:00
parent 1fea7c4bdd
commit 512c2204b1
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/net/ConnectivityManager.java
View File

@@ -355,11 +355,17 @@ public class ConnectivityManager {
*/ */
public static final int TYPE_WIFI_P2P = 13; public static final int TYPE_WIFI_P2P = 13;
/** {@hide} */ /**
public static final int MAX_RADIO_TYPE = TYPE_WIFI_P2P; * The network to use for initially attaching to the network
* {@hide}
*/
public static final int TYPE_MOBILE_IA = 14;
/** {@hide} */ /** {@hide} */
public static final int MAX_NETWORK_TYPE = TYPE_WIFI_P2P; public static final int MAX_RADIO_TYPE = TYPE_MOBILE_IA;
/** {@hide} */
public static final int MAX_NETWORK_TYPE = TYPE_MOBILE_IA;
/** /**
* If you want to set the default network preference,you can directly * If you want to set the default network preference,you can directly
@@ -436,6 +442,8 @@ public class ConnectivityManager {
return "MOBILE_CBS"; return "MOBILE_CBS";
case TYPE_WIFI_P2P: case TYPE_WIFI_P2P:
return "WIFI_P2P"; return "WIFI_P2P";
case TYPE_MOBILE_IA:
return "MOBILE_IA";
default: default:
return Integer.toString(type); return Integer.toString(type);
} }
@@ -458,6 +466,7 @@ public class ConnectivityManager {
case TYPE_MOBILE_FOTA: case TYPE_MOBILE_FOTA:
case TYPE_MOBILE_IMS: case TYPE_MOBILE_IMS:
case TYPE_MOBILE_CBS: case TYPE_MOBILE_CBS:
case TYPE_MOBILE_IA:
return true; return true;
default: default:
return false; return false;
@@ -489,6 +498,7 @@ public class ConnectivityManager {
case TYPE_MOBILE_MMS: case TYPE_MOBILE_MMS:
case TYPE_MOBILE_SUPL: case TYPE_MOBILE_SUPL:
case TYPE_MOBILE_HIPRI: case TYPE_MOBILE_HIPRI:
case TYPE_MOBILE_IA:
return true; return true;
default: default:
return false; return false;

3
services/java/com/android/server/ConnectivityService.java
View File

@@ -472,6 +472,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
com.android.internal.R.array.radioAttributes); com.android.internal.R.array.radioAttributes);
for (String raString : raStrings) { for (String raString : raStrings) {
RadioAttributes r = new RadioAttributes(raString); RadioAttributes r = new RadioAttributes(raString);
if (VDBG) log("raString=" + raString + " r=" + r);
if (r.mType > ConnectivityManager.MAX_RADIO_TYPE) { if (r.mType > ConnectivityManager.MAX_RADIO_TYPE) {
loge("Error in radioAttributes - ignoring attempt to define type " + r.mType); loge("Error in radioAttributes - ignoring attempt to define type " + r.mType);
continue; continue;
@@ -492,6 +493,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
for (String naString : naStrings) { for (String naString : naStrings) {
try { try {
NetworkConfig n = new NetworkConfig(naString); NetworkConfig n = new NetworkConfig(naString);
if (VDBG) log("naString=" + naString + " config=" + n);
if (n.type > ConnectivityManager.MAX_NETWORK_TYPE) { if (n.type > ConnectivityManager.MAX_NETWORK_TYPE) {
loge("Error in networkAttributes - ignoring attempt to define type " + loge("Error in networkAttributes - ignoring attempt to define type " +
n.type); n.type);
@@ -518,6 +520,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// ignore it - leave the entry null // ignore it - leave the entry null
} }
} }
if (VDBG) log("mNetworksDefined=" + mNetworksDefined);
mProtectedNetworks = new ArrayList<Integer>(); mProtectedNetworks = new ArrayList<Integer>();
int[] protectedNetworks = context.getResources().getIntArray( int[] protectedNetworks = context.getResources().getIntArray(