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

Author: Robert Greenwalt

core/java/android/net/MobileDataStateTracker.java

@@ -246,6 +246,9 @@ public void onReceive(Context context, Intent intent) {
                                     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 boolean reconnect() {
                 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:

core/java/android/net/NetworkStateTracker.java

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