Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 886ab256: am cb7c0350: Merge "Undeprecate android.net.ProxyInfo as it\'s still used." into mnc-dev

Browse Source 
* commit '886ab256447f26fc21dfd328e070a11bcfd06374':
  Undeprecate android.net.ProxyInfo as it's still used.
This commit is contained in:
Paul Jensen
2015-05-20 11:07:34 +00:00
committed by Android Git Automerger
parent a53349dd55 886ab25644
commit d3a56eda9d
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -18397,7 +18397,7 @@ package android.net {
field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE"; 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);
method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int, java.util.List<java.lang.String>); 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); method public static android.net.ProxyInfo buildPacProxy(android.net.Uri);

2
api/system-current.txt
View File

@@ -19905,7 +19905,7 @@ package android.net {
field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE"; 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);
method public static android.net.ProxyInfo buildDirectProxy(java.lang.String, int, java.util.List<java.lang.String>); 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); method public static android.net.ProxyInfo buildPacProxy(android.net.Uri);

6
core/java/android/net/ProxyInfo.java
View File

@@ -35,13 +35,7 @@ import java.util.Locale;
* *
* Other HTTP stacks will need to obtain the proxy info from * 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}. * {@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 { public class ProxyInfo implements Parcelable {
private String mHost; private String mHost;