From ecc33d43e95b0c85c1550c3034e1df6992f46388 Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Sat, 26 Mar 2011 08:32:25 -0700 Subject: [PATCH] Fix Default route after secondary net use. Backport of honeycomb-mr1 change 103299 adding a host route for the default gateway before adding the default route. Also fixing bug where "already active" condition of APN failed to propagate the default gateway info, result in a loss of that address. bug:4175328 Change-Id: I4cf8605b259cf40c3631c7ce6cca4c75c1b22651 --- core/java/android/net/MobileDataStateTracker.java | 4 ++++ core/java/android/net/NetworkStateTracker.java | 1 + 2 files changed, 5 insertions(+) diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index b5596013c6019..4d89df3b4299d 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -246,6 +246,9 @@ public class MobileDataStateTracker extends NetworkStateTracker { Log.d(TAG, "CONNECTED event did not supply interface name."); } 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); break; } @@ -384,6 +387,7 @@ public class MobileDataStateTracker extends NetworkStateTracker { intent.putExtra(Phone.DATA_APN_KEY, mApnName); intent.putExtra(Phone.DATA_IFACE_NAME_KEY, mInterfaceName); intent.putExtra(Phone.NETWORK_UNAVAILABLE_KEY, false); + intent.putExtra(Phone.DATA_GATEWAY_KEY, mDefaultGatewayAddr); if (mStateReceiver != null) mStateReceiver.onReceive(mContext, intent); break; case Phone.APN_REQUEST_STARTED: diff --git a/core/java/android/net/NetworkStateTracker.java b/core/java/android/net/NetworkStateTracker.java index 19986d149be6f..aa3e922fcf2f4 100644 --- a/core/java/android/net/NetworkStateTracker.java +++ b/core/java/android/net/NetworkStateTracker.java @@ -162,6 +162,7 @@ public abstract class NetworkStateTracker extends Handler { Log.d(TAG, "addDefaultRoute for " + mNetworkInfo.getTypeName() + " (" + mInterfaceName + "), GatewayAddr=" + mDefaultGatewayAddr); } + NetworkUtils.addHostRoute(mInterfaceName, mDefaultGatewayAddr); NetworkUtils.setDefaultRoute(mInterfaceName, mDefaultGatewayAddr); } }