Merge "Notify people of empty proxies too." into ics-factoryrom

Author: Wink Saville

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

@@ -2618,7 +2618,8 @@ private void handleApplyDefaultProxy(int type) {
             }
         }
         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);
     }

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

@@ -1768,8 +1768,10 @@ protected void onDataSetupComplete(AsyncResult ar) {
             ApnSetting apn = apnContext.getApnSetting();
             if (apn.proxy != null && apn.proxy.length() != 0) {
                 try {
+                    String port = apn.port;
+                    if (TextUtils.isEmpty(port)) port = "8080";
                     ProxyProperties proxy = new ProxyProperties(apn.proxy,
-                            Integer.parseInt(apn.port), null);
+                            Integer.parseInt(port), null);
                     dcac.setLinkPropertiesHttpProxySync(proxy);
                 } catch (NumberFormatException e) {
                     loge("onDataSetupComplete: NumberFormatException making ProxyProperties (" +