diff options
| author | Narayan Kamath <narayan@google.com> | 2014-12-10 18:55:12 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-02-04 09:50:46 +0000 |
| commit | 406e1ed9883010928cfb42246cfd2710ebf3da74 (patch) | |
| tree | 4ecf899952a5caf87f659ed58436257bd2072d4d /api | |
| parent | 46a9721aebb3be64ec6f6941414b3f54131d2954 (diff) | |
| download | frameworks_base-406e1ed9883010928cfb42246cfd2710ebf3da74.zip frameworks_base-406e1ed9883010928cfb42246cfd2710ebf3da74.tar.gz frameworks_base-406e1ed9883010928cfb42246cfd2710ebf3da74.tar.bz2 | |
Remove apache specific socket factory API.
Note that this change also includes another (non-breaking) update from
another of my changes from a month ago. I guess nobody has updated API on
master in a very long time..
bug: 18027885
Change-Id: I1fb1bcdaac07131c3bc43b13ad21cacd12a2e7c8
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/removed.txt | 8 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/system-removed.txt | 8 |
4 files changed, 16 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 0c77904..269cdf0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17634,7 +17634,6 @@ package android.net { method public static javax.net.SocketFactory getDefault(int); method public static javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache); method public java.lang.String[] getDefaultCipherSuites(); - method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache); method public byte[] getNpnSelectedProtocol(java.net.Socket); method public java.lang.String[] getSupportedCipherSuites(); diff --git a/api/removed.txt b/api/removed.txt index 1b69ee8..9322973 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -6,6 +6,14 @@ package android.media { } +package android.net { + + public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory { + method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); + } + +} + package android.os { public final class PowerManager { diff --git a/api/system-current.txt b/api/system-current.txt index 8597e25..70c2b29 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -18894,7 +18894,6 @@ package android.net { method public static javax.net.SocketFactory getDefault(int); method public static javax.net.ssl.SSLSocketFactory getDefault(int, android.net.SSLSessionCache); method public java.lang.String[] getDefaultCipherSuites(); - method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); method public static javax.net.ssl.SSLSocketFactory getInsecure(int, android.net.SSLSessionCache); method public byte[] getNpnSelectedProtocol(java.net.Socket); method public java.lang.String[] getSupportedCipherSuites(); diff --git a/api/system-removed.txt b/api/system-removed.txt index 1b69ee8..9322973 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -6,6 +6,14 @@ package android.media { } +package android.net { + + public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory { + method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache); + } + +} + package android.os { public final class PowerManager { |