From 27725e8cd1e2eb3b88186ae8d43e437f130b1f84 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Tue, 29 Mar 2011 11:36:28 -0700
Subject: [PATCH] Only leave one default network up at a time.

If original refuses to tear down, tear down new one.  It's better
to have none (which will try to launch them all again) than two.

Really people shouldn't refuse the teardown request.

bug:4183397
Change-Id: I54ea1bf0d2cd2ef16fcf2eafc69895ad2fe33ffd
---
 services/java/com/android/server/ConnectivityService.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 6694dbe8ff4d..8f0816d5097c 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -1266,6 +1266,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                             " teardown");
                     if (!teardown(otherNet)) {
                         Slog.e(TAG, "Network declined teardown request");
+                        teardown(thisNet);
                         return;
                     }
                     if (isFailover) {
-- 
2.11.0