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

Commit 406e1ed9 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

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
parent 46a9721a

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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();

api/removed.txt

+8 −0
Original line number Diff line number Diff line
@@ -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 {

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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();

api/system-removed.txt

+8 −0
Original line number Diff line number Diff line
@@ -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 {

core/java/android/net/SSLCertificateSocketFactory.java

+2 −0
Original line number Diff line number Diff line
@@ -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(