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

Original change: undetermined

Change-Id: Id383cd417423bf10b36a2fa72dca201f4657114d

services/java/com/android/server/ConnectivityService.java

@@ -2618,7 +2618,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
             }
         }
         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);
     }