commit e00e35a54cf0a5ed5904e2adea10929ecd875c65
author Robert Greenwalt <rgreenwalt@google.com> Mon Apr 04 12:18:58 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 04 12:18:58 2011 -0700
tree f9d2584a7aff8bf338f60c2729085fd46ea7f6b7
parent b2f5deca7df99e2f81a6696312cfada89192dbfd
parent 9991017bbd026080695fc33198609be7bfd4f9be

am 9991017b: Only leave one default network up at a time.

* commit '9991017bbd026080695fc33198609be7bfd4f9be':
  Only leave one default network up at a time.

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 4145854..a64ceb9 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1297,6 +1297,7 @@
                             " teardown");
                     if (!teardown(otherNet)) {
                         Slog.e(TAG, "Network declined teardown request");
+                        teardown(thisNet);
                         return;
                     }
                     if (isFailover) {