Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7544b23e authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

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

parents 96cf34d3 ecc33d43

core/java/android/net/MobileDataStateTracker.java

+4 −0
Original line number Diff line number Diff line
@@ -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:

core/java/android/net/NetworkStateTracker.java

+1 −0
Original line number Diff line number Diff line
@@ -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);

        }

    }