commit 377cf20b833a35f7266fb0c6a0c80217a0e0c7da
author Robert Greenwalt <rgreenwalt@google.com> Wed Jul 27 09:27:00 2011 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Wed Jul 27 09:27:00 2011 -0700
tree c9372ca32c5aaf2b401b835d66ad2cc421523852
parent 9186900f54014deddb0bab1455852a4ce7f678ba
parent 9520d6af5a2a00333af0244b6cbe3a9e27513bb6

resolved conflicts for merge of 9520d6af to honeycomb-plus-aosp

Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3

core/java/android/net/NetworkUtils.java

diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java
index e07cbce..e289fc1 100644
--- a/core/java/android/net/NetworkUtils.java
+++ b/core/java/android/net/NetworkUtils.java
@@ -244,7 +244,7 @@
      */
     public static String[] makeStrings(Collection<InetAddress> addrs) {
         String[] result = new String[addrs.size()];
-        int i=0;
+        int i = 0;
         for (InetAddress addr : addrs) {
             result[i++] = addr.getHostAddress();
         }

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 8ad9f91..2f6bbec 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;
                     }
                 }