commit 6ef5bd7a00225156661b35271d590f5a12643561
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 22 13:15:56 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 22 13:15:56 2011 -0700
tree 83db0350647fb3ecdb66c71e24d0509d9c1bb9ce
parent 4dd0424da1e2021ba5b8702d906810eb05000662
parent 9810742cd8fef368429ad0f4f1426270e9934923

am 9810742c: Add better routes for secondary DNS

* commit '9810742cd8fef368429ad0f4f1426270e9934923':
  Add better routes for secondary DNS

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 06be27b..9148dcd 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1438,6 +1438,7 @@
                     }
                     if (!teardown(otherNet)) {
                         loge("Network declined teardown request");
+                        teardown(thisNet);
                         return;
                     }
                 }