Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f361e3df authored by Paul Jensen's avatar Paul Jensen
Browse files

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
parent c1a9436d

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -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);

























core/java/android/net/ProxyInfo.java



+0
−6




























Original line number
Diff line number
Diff line








@@ -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;