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

Author: Robert Greenwalt

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

@@ -2299,7 +2299,7 @@ private void handleApplyDefaultProxy(int type) {
         synchronized (this) {
             if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
             if (mDefaultProxy == proxy) return;
-            if (!TextUtils.isEmpty(proxy.getHost())) {
+            if (proxy != null && !TextUtils.isEmpty(proxy.getHost())) {
                 mDefaultProxy = proxy;
             } else {
                 mDefaultProxy = null;