am 568845a7: Merge "Fix some alt-network issues." into gingerbread

* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
This commit is contained in:
Robert Greenwalt
2011-03-30 09:30:15 -07:00
committed by Android Git Automerger
2 changed files with 14 additions and 12 deletions

View File

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

View File

@ -594,18 +594,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/ */
public NetworkInfo getActiveNetworkInfo() { public NetworkInfo getActiveNetworkInfo() {
enforceAccessPermission(); enforceAccessPermission();
for (int type=0; type <= ConnectivityManager.MAX_NETWORK_TYPE; type++) { if (mActiveDefaultNetwork != -1) {
if (mNetAttributes[type] == null || !mNetAttributes[type].isDefault()) { return mNetTrackers[mActiveDefaultNetwork].getNetworkInfo();
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;
}
} }
return null; return null;
} }
@ -1369,6 +1359,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (mNetAttributes[netType].isDefault()) { if (mNetAttributes[netType].isDefault()) {
mNetTrackers[netType].addDefaultRoute(); mNetTrackers[netType].addDefaultRoute();
} else { } 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(); mNetTrackers[netType].addPrivateDnsRoutes();
} }
} else { } else {