summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorPaul Jensen <pauljensen@google.com>2015-05-19 15:00:56 -0400
committerPaul Jensen <pauljensen@google.com>2015-05-19 15:09:17 -0400
commitf361e3dff9bb3d8ed72a76d5703761140296bbd0 (patch)
tree015a771c1c8cd28dd352fc3b26fee14cf56bdfab /core/java/android/net
parentc1a9436d27e41347e6063b1cfb77eaef7e191ca4 (diff)
downloadframeworks_base-f361e3dff9bb3d8ed72a76d5703761140296bbd0.zip
frameworks_base-f361e3dff9bb3d8ed72a76d5703761140296bbd0.tar.gz
frameworks_base-f361e3dff9bb3d8ed72a76d5703761140296bbd0.tar.bz2
Undeprecate android.net.ProxyInfo as it's still used.
It was deprecated as part of the Apache deprecation, however it is used by ConnectivityManager.getLinkProperties() and .getDefaultProxy(). The alternatives (e.g. java.net.Proxy) do not offer a complete replacement as they lack certain fields (e.g. PAC URL). Bug:21274137 Change-Id: I99163a2611a738f337fb9907349ef6255dbed6d6
Diffstat (limited to 'core/java/android/net')
-rw-r--r--core/java/android/net/ProxyInfo.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java
index 2c90909..5f5e623 100644
--- a/core/java/android/net/ProxyInfo.java
+++ b/core/java/android/net/ProxyInfo.java
@@ -35,13 +35,7 @@ import java.util.Locale;
*
* Other HTTP stacks will need to obtain the proxy info from
* {@link Proxy#PROXY_CHANGE_ACTION} broadcast as the extra {@link Proxy#EXTRA_PROXY_INFO}.
- *
- * @deprecated Please use {@link java.net.URL#openConnection}, {@link java.net.Proxy} and
- * friends. The Apache HTTP client is no longer maintained and may be removed in a future
- * release. Please visit <a href="http://android-developers.blogspot.com/2011/09/androids-http-clients.html">this webpage</a>
- * for further details.
*/
-@Deprecated
public class ProxyInfo implements Parcelable {
private String mHost;