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

Commit 3766cb3b authored by Paul Jensen's avatar Paul Jensen Committed by Android Git Automerger
Browse files

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

* commit 'cb7c0350':
  Undeprecate android.net.ProxyInfo as it's still used.
parents 033bbf6c cb7c0350

api/current.txt

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