diff --git a/api/current.txt b/api/current.txt index 80c4dc85a53d3..97db5aaad99bb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18397,7 +18397,7 @@ package android.net { field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE"; } - public deprecated class ProxyInfo implements android.os.Parcelable { + public class ProxyInfo implements android.os.Parcelable { method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int); method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int, java.util.List); method public static android.net.ProxyInfo buildPacProxy(android.net.Uri); diff --git a/api/system-current.txt b/api/system-current.txt index 6c4f2785db625..10bf1ae51782c 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -19905,7 +19905,7 @@ package android.net { field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE"; } - public deprecated class ProxyInfo implements android.os.Parcelable { + public class ProxyInfo implements android.os.Parcelable { method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int); method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int, java.util.List); method public static android.net.ProxyInfo buildPacProxy(android.net.Uri); diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java index 2c90909e0a498..5f5e6235eb8bf 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;