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

Fix no-mobile-data after wifi.

Browse Source 
Missed a case - if you disabled mobile data and then cycled wifi, 3g would
be turned back on.

bug:2251458
This commit is contained in:
Robert Greenwalt
2010-02-25 12:04:29 -08:00
parent 1b21f6c058
commit 72451bf6b6
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -934,9 +934,18 @@ public class ConnectivityService extends IConnectivityManager.Stub {
int newType = -1; int newType = -1;
int newPriority = -1; int newPriority = -1;
boolean noMobileData = !getMobileDataEnabled();
for (int checkType=0; checkType <= ConnectivityManager.MAX_NETWORK_TYPE; checkType++) { for (int checkType=0; checkType <= ConnectivityManager.MAX_NETWORK_TYPE; checkType++) {
if (checkType == prevNetType) continue; if (checkType == prevNetType) continue;
if (mNetAttributes[checkType] == null) continue; if (mNetAttributes[checkType] == null) continue;
if (mNetAttributes[checkType].mRadio == ConnectivityManager.TYPE_MOBILE &&
noMobileData) {
if (DBG) {
Log.d(TAG, "not failing over to mobile type " + checkType +
" because Mobile Data Disabled");
}
continue;
}
if (mNetAttributes[checkType].isDefault()) { if (mNetAttributes[checkType].isDefault()) {
/* TODO - if we have multiple nets we could use /* TODO - if we have multiple nets we could use
* we may want to put more thought into which we choose * we may want to put more thought into which we choose