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

Merge "Fix some alt-network issues." into gingerbread

Browse Source
This commit is contained in:
Robert Greenwalt
2011-03-25 09:35:53 -07:00
committed by Android (Google) Code Review
parent 9c1ef09883 7cf5b419da
commit 568845a766
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/NetworkStateTracker.java
View File

@@ -410,4 +410,7 @@ public abstract class NetworkStateTracker extends Handler {
public void interpretScanResultsAvailable() {
}
public String getInterfaceName() {
return mInterfaceName;
}
}

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

@@ -591,18 +591,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) Slog.e(TAG,
"connected default network is not " +
"mActiveDefaultNetwork!");
return info;
}
if (mActiveDefaultNetwork != -1) {
return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
}
return null;
}
@@ -1338,6 +1328,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (mNetAttributes[netType].isDefault()) {
mNetTrackers[netType].addDefaultRoute();
} else {
// 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) {
String defaultIface = mNetTrackers[mActiveDefaultNetwork].getInterfaceName();
if (defaultIface != null &&
!defaultIface.equals(mNetTrackers[netType].getInterfaceName())) {
mNetTrackers[netType].removeDefaultRoute();
}
}
mNetTrackers[netType].addPrivateDnsRoutes();
}
} else {