From 81c7260a932a2bd6a2ceaf9b94505d17b1149605 Mon Sep 17 00:00:00 2001 From: Paul Jensen Date: Tue, 19 May 2015 15:00:56 -0400 Subject: [PATCH] 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 --- core/java/android/net/ProxyInfo.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java index 2c90909e0a..5f5e6235eb 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 this webpage - * for further details. */ -@Deprecated public class ProxyInfo implements Parcelable { private String mHost;