summaryrefslogtreecommitdiffstats
path: root/core/java/android/net/Proxy.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 /core/java/android/net/Proxy.java
parent03ee779b28227e75f16cb6240c5c667d097e59d1 (diff)
downloadframeworks_base-55985bed7be8c93296eee3f4f39557fba4fbaebe.zip
frameworks_base-55985bed7be8c93296eee3f4f39557fba4fbaebe.tar.gz
frameworks_base-55985bed7be8c93296eee3f4f39557fba4fbaebe.tar.bz2
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 'core/java/android/net/Proxy.java')
-rw-r--r--core/java/android/net/Proxy.java4
1 files changed, 3 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