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

Fix a bad merge.

Browse Source 
Re-add change 103769 (Change-Id: I9e7c94718a5b1f08840b219b304ba3904259a65f) from gingerbread
after the bad merge was reverted by master change 104487
(Change-Id: I8fad7ee11f4b26630f3cc4b31cc9cafbe66b3bf4).

bug:4157610
Change-Id: I96a75d71220cc7886a5b186b415d8dacf6951ca6
This commit is contained in:
Robert Greenwalt
2011-04-01 10:51:22 -07:00
parent e698829381
commit 1e2f286a27
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
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,6 +1343,19 @@ public class ConnectivityService extends IConnectivityManager.Stub {
handleApplyDefaultProxy(netType);
addDefaultRoute(mNetTrackers[netType]);
} else {
// many radios add a default route even when we don't want one.
// remove the default route unless we need it for our active network
if (mActiveDefaultNetwork != -1) {
LinkProperties defaultLinkProperties =
mNetTrackers[mActiveDefaultNetwork].getLinkProperties();
LinkProperties newLinkProperties =
mNetTrackers[netType].getLinkProperties();
String defaultIface = defaultLinkProperties.getInterfaceName();
if (defaultIface != null &&
!defaultIface.equals(newLinkProperties.getInterfaceName())) {
removeDefaultRoute(mNetTrackers[netType]);
}
}
addPrivateDnsRoutes(mNetTrackers[netType]);
}
} else {