diff options
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/net/ProxyInfo.java | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index 3c81fbb..865b9d3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -18396,7 +18396,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<java.lang.String>); method public static android.net.ProxyInfo buildPacProxy(android.net.Uri); diff --git a/api/system-current.txt b/api/system-current.txt index 0dd5fd8..7925b21 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<java.lang.String>); 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 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; |