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

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