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

Merge "Fix Default route after secondary net use." into gingerbread

Browse Source
This commit is contained in:
Robert Greenwalt
2011-03-26 08:58:01 -07:00
committed by Android (Google) Code Review
parent 96cf34d362 ecc33d43e9
commit 7544b23e52
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/MobileDataStateTracker.java
View File

@@ -246,6 +246,9 @@ public class MobileDataStateTracker extends NetworkStateTracker {
Log.d(TAG, "CONNECTED event did not supply interface name."); Log.d(TAG, "CONNECTED event did not supply interface name.");
} }
mDefaultGatewayAddr = intent.getIntExtra(Phone.DATA_GATEWAY_KEY, 0); mDefaultGatewayAddr = intent.getIntExtra(Phone.DATA_GATEWAY_KEY, 0);
if (mDefaultGatewayAddr == 0) {
Log.d(TAG, "CONNECTED event did not supply a default gateway.");
}
setDetailedState(DetailedState.CONNECTED, reason, apnName); setDetailedState(DetailedState.CONNECTED, reason, apnName);
break; break;
} }
@@ -384,6 +387,7 @@ public class MobileDataStateTracker extends NetworkStateTracker {
intent.putExtra(Phone.DATA_APN_KEY, mApnName); intent.putExtra(Phone.DATA_APN_KEY, mApnName);
intent.putExtra(Phone.DATA_IFACE_NAME_KEY, mInterfaceName); intent.putExtra(Phone.DATA_IFACE_NAME_KEY, mInterfaceName);
intent.putExtra(Phone.NETWORK_UNAVAILABLE_KEY, false); intent.putExtra(Phone.NETWORK_UNAVAILABLE_KEY, false);
intent.putExtra(Phone.DATA_GATEWAY_KEY, mDefaultGatewayAddr);
if (mStateReceiver != null) mStateReceiver.onReceive(mContext, intent); if (mStateReceiver != null) mStateReceiver.onReceive(mContext, intent);
break; break;
case Phone.APN_REQUEST_STARTED: case Phone.APN_REQUEST_STARTED:

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

@@ -162,6 +162,7 @@ public abstract class NetworkStateTracker extends Handler {
Log.d(TAG, "addDefaultRoute for " + mNetworkInfo.getTypeName() + Log.d(TAG, "addDefaultRoute for " + mNetworkInfo.getTypeName() +
" (" + mInterfaceName + "), GatewayAddr=" + mDefaultGatewayAddr); " (" + mInterfaceName + "), GatewayAddr=" + mDefaultGatewayAddr);
} }
NetworkUtils.addHostRoute(mInterfaceName, mDefaultGatewayAddr);
NetworkUtils.setDefaultRoute(mInterfaceName, mDefaultGatewayAddr); NetworkUtils.setDefaultRoute(mInterfaceName, mDefaultGatewayAddr);
} }
} }