drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent 5e1383f257 568845a766
commit ce6766ea51
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,18 +594,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;
}
@ -1369,6 +1359,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 {