commit 796539b12ad0d02b722de056d2c5f791fcfc3403
author Robert Greenwalt <rgreenwalt@google.com> Mon Jun 20 12:15:24 2011 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Mon Jun 20 12:15:24 2011 -0700
tree 6f5c044edbf9ef5bdb033867c47d96c640329bb5
parent 00ca322d5d99056b47a74075e2d2c8b464bbdbc1
parent 33cdcdf2fac67a336d64baaf412522488618bac1

resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp

Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index a8ddc15..aee2a9a 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1347,6 +1347,7 @@
                     }
                     if (!teardown(otherNet)) {
                         loge("Network declined teardown request");
+                        teardown(thisNet);
                         return;
                     }
                 }
@@ -1396,6 +1397,19 @@
                 handleApplyDefaultProxy(netType);
                 addDefaultRoute(mNetTrackers[netType]);
             } else {
+                // many radios add a default route even when we don't want one.
+                // remove the default interface unless we need it for our active network
+                if (mActiveDefaultNetwork != -1) {
+                    LinkProperties linkProperties =
+                            mNetTrackers[mActiveDefaultNetwork].getLinkProperties();
+                    LinkProperties newLinkProperties =
+                            mNetTrackers[netType].getLinkProperties();
+                    String defaultIface = linkProperties.getInterfaceName();
+                    if (defaultIface != null &&
+                            !defaultIface.equals(newLinkProperties.getInterfaceName())) {
+                        removeDefaultRoute(mNetTrackers[netType]);
+                    }
+                }
                 addPrivateDnsRoutes(mNetTrackers[netType]);
             }
         } else {