summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/ConnectivityService.java
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2010-12-23 15:51:10 -0800
committerRobert Greenwalt <rgreenwalt@google.com>2010-12-28 11:15:06 -0800
commit55985bed7be8c93296eee3f4f39557fba4fbaebe (patch)
tree775e354f2befeb42d7f0c46b739d85c656891acf /services/java/com/android/server/ConnectivityService.java
parent03ee779b28227e75f16cb6240c5c667d097e59d1 (diff)
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
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
-rw-r--r--services/java/com/android/server/ConnectivityService.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index feb7b63bd99c..a84ba785d00c 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);