commit 18510113794df002ee288d8d5fdf8b64b4c957b5
author Robert Greenwalt <rgreenwalt@google.com> Mon Apr 04 16:26:42 2011 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Mon Apr 04 16:26:42 2011 -0700
tree 18661a585d35c5b18c1a97b679752d7214d35d6a
parent f7dae30b20bf173190c0b68b7e49a5cffbd32e61
parent e00e35a54cf0a5ed5904e2adea10929ecd875c65

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

Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf

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