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

Merge "Move Proxy, PacProxySelector out of Connectivity"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2021-03-02 07:49:00 +00:00
committed by Gerrit Code Review
parent 4eb9b18e02 9200ec1579
commit ae171d864d
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/api/current.txt
View File

@@ -25016,6 +25016,16 @@ package android.net {
field public static final int TYPE_IKEV2_IPSEC_USER_PASS = 6; // 0x6 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 { @Deprecated public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {
ctor @Deprecated public SSLCertificateSocketFactory(int); ctor @Deprecated public SSLCertificateSocketFactory(int);
method @Deprecated public java.net.Socket createSocket(java.net.Socket, String, int, boolean) throws java.io.IOException; method @Deprecated public java.net.Socket createSocket(java.net.Socket, String, int, boolean) throws java.io.IOException;

4
core/api/module-lib-current.txt
View File

@@ -18,6 +18,10 @@ package android.net {
method @Nullable public byte[] getWatchlistConfigHash(); 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 { public final class UnderlyingNetworkInfo implements android.os.Parcelable {
ctor public UnderlyingNetworkInfo(int, @NonNull String, @NonNull java.util.List<java.lang.String>); ctor public UnderlyingNetworkInfo(int, @NonNull String, @NonNull java.util.List<java.lang.String>);
method public int describeContents(); method public int describeContents();

0
packages/Connectivity/framework/src/android/net/PacProxySelector.java → core/java/android/net/PacProxySelector.java
View File

0
packages/Connectivity/framework/src/android/net/Proxy.java → core/java/android/net/Proxy.java
View File

10
packages/Connectivity/framework/api/current.txt
View File

@@ -400,16 +400,6 @@ package android.net {
method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier); 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 { public class ProxyInfo implements android.os.Parcelable {
ctor public ProxyInfo(@Nullable android.net.ProxyInfo); ctor public ProxyInfo(@Nullable android.net.ProxyInfo);
method public static android.net.ProxyInfo buildDirectProxy(String, int); method public static android.net.ProxyInfo buildDirectProxy(String, int);

4
packages/Connectivity/framework/api/module-lib-current.txt
View File

@@ -23,10 +23,6 @@ package android.net {
field public static final int TRANSPORT_TEST = 7; // 0x7 field public static final int TRANSPORT_TEST = 7; // 0x7
} }
public final class Proxy {
method public static void setHttpProxyConfiguration(@Nullable android.net.ProxyInfo);
}
public final class TcpRepairWindow { public final class TcpRepairWindow {
ctor public TcpRepairWindow(int, int, int, int, int, int); ctor public TcpRepairWindow(int, int, int, int, int, int);
field public final int maxWindow; field public final int maxWindow;