commit 693ee83a6ce3e02e7844e1785bd86854a53042c8
author Wink Saville <wink@google.com> Thu Sep 22 10:53:40 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 22 10:53:40 2011 -0700
tree 60d6af30ada9479cd2b0a73c8ef856a5b6f15e9f
parent 933cb47f641bf59558bb148c6d9e819d36fc1287
parent 90b574ef059bcae88ecaa5870f095706432d581c

am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom

* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
  Notify people of empty proxies too.

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 2b1638b..86ac296 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2618,7 +2618,8 @@
             }
         }
         if (VDBG) log("changing default proxy to " + proxy);
-        if ((proxy == null && mGlobalProxy == null) || proxy.equals(mGlobalProxy)) return;
+
+        // global trumps default, if set, ignore this.
         if (mGlobalProxy != null) return;
         sendProxyBroadcast(proxy);
     }