DO NOT MERGE Always set/remove default routes.

Must clean up default route if a default 3g connection is replaced
by a non-default (ie, mms) connection on teh same interface.

Also stop mucking with all connections dns and routes - do it only
for the connection that has changed.

bug:2865974
Change-Id: Ifdf49080fa0413a4d826813706c809975a562dfa

1 files changed, 2 insertions, 6 deletions

diff --git a/core/java/android/net/NetworkStateTracker.java b/core/java/android/net/NetworkStateTracker.java
index 1fb0144..0277d2d 100644
--- a/core/java/android/net/NetworkStateTracker.java
+++ b/core/java/android/net/NetworkStateTracker.java
@@ -45,7 +45,6 @@ public abstract class NetworkStateTracker extends Handler {
     protected String[] mDnsPropNames;
     private boolean mPrivateDnsRouteSet;
     protected int mDefaultGatewayAddr;
-    private boolean mDefaultRouteSet;
     private boolean mTeardownRequested;
 
     private static boolean DBG = true;
@@ -153,25 +152,22 @@ public abstract class NetworkStateTracker extends Handler {
     }
 
     public void addDefaultRoute() {
-        if ((mInterfaceName != null) && (mDefaultGatewayAddr != 0) &&
-                mDefaultRouteSet == false) {
+        if ((mInterfaceName != null) && (mDefaultGatewayAddr != 0)) {
             if (DBG) {
                 Log.d(TAG, "addDefaultRoute for " + mNetworkInfo.getTypeName() +
                         " (" + mInterfaceName + "), GatewayAddr=" + mDefaultGatewayAddr);
             }
             NetworkUtils.setDefaultRoute(mInterfaceName, mDefaultGatewayAddr);
-            mDefaultRouteSet = true;
         }
     }
 
     public void removeDefaultRoute() {
-        if (mInterfaceName != null && mDefaultRouteSet == true) {
+        if (mInterfaceName != null) {
             if (DBG) {
                 Log.d(TAG, "removeDefaultRoute for " + mNetworkInfo.getTypeName() + " (" +
                         mInterfaceName + ")");
             }
             NetworkUtils.removeDefaultRoute(mInterfaceName);
-            mDefaultRouteSet = false;
         }
     }