diff options
| -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 | ||||
| -rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 2 |
5 files changed, 18 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 { diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 6654577..27096b1 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -159,6 +159,8 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { * instead. 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. + * + * @removed */ @Deprecated public static org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory( |