commit ee4e84b3346b4160b7bd45c134ca7c0d7322b6af
author Robert Greenwalt <rgreenwalt@google.com> Fri Sep 09 15:52:42 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 09 15:52:42 2011 -0700
tree 3f0b14f3da9455a095e02b986f5aff6011cb94bb
parent 0e9cd3b2dcd0ca841d5c3cb2358deb45c06ba029
parent 3084999887ffc9e54b01996b84822d26e0b51b67

am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE

* commit '2f835a6193c14e27cf761d85ac3ea4c9bd9296f8':
  Make copies of NetworkInfo to give out.

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