commit 2ff2707df406578bad4484647782462577c5a6ff
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 15 10:20:48 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 15 10:20:48 2011 -0700
tree f81e19334bf0bc07a49c29d354982d27f48fe251
parent d57579a4a4ee84d80f616ea995a86d4734abfe2d
parent 57c83bb4e69034efcfe45f19a8d44955f4921c3d

am 57c83bb4: Small fix to 5008973 fix.

* commit '57c83bb4e69034efcfe45f19a8d44955f4921c3d':
  Small fix to 5008973 fix.

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