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

am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp

Browse Source 
* commit '047f9d12976d90d0931a64a256bb4843d77f5e20':
  Fix some alt-network issues.
This commit is contained in:
Robert Greenwalt
2011-03-30 16:40:23 -07:00
committed by Android Git Automerger
parent b471d761d2 3a378b9f2d
commit fbba87d35f
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -543,18 +543,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/
public NetworkInfo getActiveNetworkInfo() {
enforceAccessPermission();
for (int type=0; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) {
if (mNetAttributes[type] == null || !mNetAttributes[type].isDefault()) {
continue;
}
NetworkStateTracker t = mNetTrackers[type];
NetworkInfo info = t.getNetworkInfo();
if (info.isConnected()) {
if (DBG && type != mActiveDefaultNetwork) {
loge("connected default network is not mActiveDefaultNetwork!");
}
return info;
}
if (mActiveDefaultNetwork != -1) {
return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
}
return null;
}
@@ -1353,7 +1343,20 @@ public class ConnectivityService extends IConnectivityManager.Stub {
handleApplyDefaultProxy(netType);
addDefaultRoute(mNetTrackers[netType]);
} else {
addPrivateDnsRoutes(mNetTrackers[netType]);
// many radios add a default route even when we don't want one.
// remove the default interface unless we need it for our active network
if (mActiveDefaultNetwork != -1) {
LinkProperties linkProperties =
mNetTrackers[mActiveDefaultNetwork].getLinkProperties();
LinkProperties newLinkProperties =
mNetTrackers[netType].getLinkProperties();
String defaultIface = linkProperties.getInterfaceName();
if (defaultIface != null &&
!defaultIface.equals(newLinkProperties.getInterfaceName())) {
mNetTrackers[netType].removeDefaultRoute();
}
}
mNetTrackers[netType].addPrivateDnsRoutes();
}
} else {
if (mNetAttributes[netType].isDefault()) {