From 611291c8ef727f8b9f146f700ec6a618afff1d1a Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Thu, 23 Dec 2010 15:51:10 -0800 Subject: [PATCH] Make sure the ProxyProperties is always present. Lets people know that it's non-null, though the InetAddr inside may be. bug:3305689 Change-Id: I0fe16a9ef1feba987680c419fa2dc0e00e400d91 --- services/java/com/android/server/ConnectivityService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index feb7b63bd9..a84ba785d0 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);