diff options
| -rw-r--r-- | core/java/android/net/Proxy.java | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/net/Proxy.java b/core/java/android/net/Proxy.java index 0ad80dd..f750122 100644 --- a/core/java/android/net/Proxy.java +++ b/core/java/android/net/Proxy.java @@ -65,7 +65,9 @@ public final class Proxy { * that either the default connection or its proxy has changed. * The intent will have the following extra value:</p> * <ul> - * <li><em>EXTRA_PROXY_INFO</em> - The ProxyProperties for the proxy + * <li><em>EXTRA_PROXY_INFO</em> - The ProxyProperties for the proxy. Non-null, + * though if the proxy is undefined the host string + * will be empty. * </ul> * * <p class="note">This is a protected intent that can only be sent by the system diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index feb7b63..a84ba78 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -2154,6 +2154,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { } private void sendProxyBroadcast(ProxyProperties proxy) { + if (proxy == null) proxy = new ProxyProperties("", 0, ""); log("sending Proxy Broadcast for " + proxy); Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION); intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); |