diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-05-19 15:00:56 -0400 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2015-05-19 15:09:17 -0400 |
| commit | f361e3dff9bb3d8ed72a76d5703761140296bbd0 (patch) | |
| tree | 015a771c1c8cd28dd352fc3b26fee14cf56bdfab /api | |
| parent | c1a9436d27e41347e6063b1cfb77eaef7e191ca4 (diff) | |
| download | frameworks_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 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 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); |