commit fec26c50974443f25715dd6dc64e81f1ea7b496c
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 09:20:51 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 29 09:20:51 2011 -0700
tree 9b72956443b186cd97abde61da1ae3d764bde453
parent 377cf20b833a35f7266fb0c6a0c80217a0e0c7da
parent f3ab069bec358f8138fed5ceabe64e303ac7d8f9

am f3ab069b: Make copy-constructor make deep copy.

* commit 'f3ab069bec358f8138fed5ceabe64e303ac7d8f9':
  Make copy-constructor make deep copy.

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;
                     }
                 }