From f361e3dff9bb3d8ed72a76d5703761140296bbd0 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 --- api/current.txt | 2 +- api/system-current.txt | 2 +- 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 3c81fbb8a3043..865b9d34401c2 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); method public static android.net.ProxyInfo buildPacProxy(android.net.Uri); diff --git a/api/system-current.txt b/api/system-current.txt index 0dd5fd8eda23a..7925b217214fa 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;