diff options
| author | Jason Monk <jmonk@google.com> | 2014-05-07 18:57:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 18:57:01 +0000 |
| commit | 4ef10931b410df2c84b0703009d340bd13a97738 (patch) | |
| tree | b0fc1066a021d28a1af0d2bb8a1bda13bc685c3a /api | |
| parent | b1e4bf641f0755c92c33977e86efadf146936f5d (diff) | |
| parent | 9d75ccb6a1b3b300c33ce3ceab5eaece0ad55d42 (diff) | |
| download | frameworks_base-4ef10931b410df2c84b0703009d340bd13a97738.zip frameworks_base-4ef10931b410df2c84b0703009d340bd13a97738.tar.gz frameworks_base-4ef10931b410df2c84b0703009d340bd13a97738.tar.bz2 | |
am 059637c4: Merge "Make proxy API public"
* commit '059637c4970bdbed19689a5e9ecb40a9ebe5a739':
Make proxy API public
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index fea0fd4..c75de7e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15712,6 +15712,7 @@ package android.net { method public android.net.NetworkInfo getActiveNetworkInfo(); method public android.net.NetworkInfo[] getAllNetworkInfo(); method public deprecated boolean getBackgroundDataSetting(); + method public android.net.ProxyInfo getGlobalProxy(); method public android.net.NetworkInfo getNetworkInfo(int); method public int getNetworkPreference(); method public boolean isActiveNetworkMetered(); @@ -15719,6 +15720,7 @@ package android.net { method public static boolean isNetworkTypeValid(int); method public void registerNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener); method public boolean requestRouteToHost(int, int); + method public void setGlobalProxy(android.net.ProxyInfo); method public void setNetworkPreference(int); method public int startUsingNetworkFeature(int, java.lang.String); method public int stopUsingNetworkFeature(int, java.lang.String); @@ -15894,9 +15896,22 @@ package android.net { method public static final deprecated int getDefaultPort(); method public static final deprecated java.lang.String getHost(android.content.Context); method public static final deprecated int getPort(android.content.Context); + field public static final java.lang.String EXTRA_PROXY_INFO = "android.intent.extra.PROXY_INFO"; field public static final java.lang.String PROXY_CHANGE_ACTION = "android.intent.action.PROXY_CHANGE"; } + 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); + method public int describeContents(); + method public java.lang.String[] getExclusionList(); + method public java.lang.String getHost(); + method public android.net.Uri getPacFileUrl(); + method public int getPort(); + method public void writeToParcel(android.os.Parcel, int); + } + public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory { ctor public deprecated SSLCertificateSocketFactory(int); method public java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException; |