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

Commit 033c0bad authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Move Proxy, PacProxySelector out of Connectivity" am: ae171d86 am:... 

Merge "Move Proxy, PacProxySelector out of Connectivity" am: ae171d86 am: b6c5e099 am: a7005ec4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib253a7ccf3beb8e9e5d0988db3d0662074dedda7
parents 3d85f14e a7005ec4

core/api/current.txt

+10 −0
Original line number Diff line number Diff line
@@ -26028,6 +26028,16 @@ package android.net { 
    field public static final int TYPE_IKEV2_IPSEC_USER_PASS = 6; // 0x6

  }













  public final class Proxy {













    ctor public Proxy();













    method @Deprecated public static String getDefaultHost();













    method @Deprecated public static int getDefaultPort();













    method @Deprecated public static String getHost(android.content.Context);













    method @Deprecated public static int getPort(android.content.Context);













    field @Deprecated public static final String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";













    field public static final String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE";













  }



























  @Deprecated public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {















    ctor @Deprecated public SSLCertificateSocketFactory(int);















    method @Deprecated public java.net.Socket createSocket(java.net.Socket, String, int, boolean) throws java.io.IOException;

























core/api/module-lib-current.txt



+4
−0




























Original line number
Diff line number
Diff line








@@ -171,6 +171,10 @@ package android.net {













    method @Nullable public byte[] getWatchlistConfigHash();















  }





























  public final class Proxy {













    method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo);













  }





























  public final class UnderlyingNetworkInfo implements android.os.Parcelable {















    ctor public UnderlyingNetworkInfo(int, @NonNull String, @NonNull java.util.List<java.lang.String>);















    method public int describeContents();









































packages/Connectivity/framework/api/current.txt



+0
−10




























Original line number
Diff line number
Diff line








@@ -401,16 +401,6 @@ package android.net {













    method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);















  }





























  public final class Proxy {













    ctor public Proxy();













    method @Deprecated public static String getDefaultHost();













    method @Deprecated public static int getDefaultPort();













    method @Deprecated public static String getHost(android.content.Context);













    method @Deprecated public static int getPort(android.content.Context);













    field @Deprecated public static final String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO";













    field public static final String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE";













  }





























  public class ProxyInfo implements android.os.Parcelable {















    ctor public ProxyInfo(@Nullable android.net.ProxyInfo);















    method public static android.net.ProxyInfo buildDirectProxy(String, int);