commit 30f045c90071035c3b008b99d0e2d2773444a554
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 10:53:16 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 29 10:53:16 2011 -0700
tree 5fd40e981cbcfdb7b2917ae3215b4ad2d2b725ae
parent fec26c50974443f25715dd6dc64e81f1ea7b496c
parent a50a0e90fdd748218b738b9c13393d65248dd2cd

am a50a0e90: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE

* commit 'a50a0e90fdd748218b738b9c13393d65248dd2cd':
  Fix NPE when going from proxy to no proxy.

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 c9ab806..2733fd3 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;
                     }
                 }