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

Commit 0cbfb82f authored by Adam Vartanian's avatar Adam Vartanian Committed by android-build-merger
Browse files

Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev 

am: 87587fbd

Change-Id: I669d80114ed83231205da0a608ee8e7cdfa8956c
parents 118e0e87 87587fbd

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -69831,7 +69831,6 @@ package javax.net.ssl { 
  public abstract class SSLSocketFactory extends javax.net.SocketFactory {

    ctor public SSLSocketFactory();

    method public abstract java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException;

    method public java.net.Socket createSocket(java.net.Socket, java.io.InputStream, boolean) throws java.io.IOException;

    method public static synchronized javax.net.SocketFactory getDefault();

    method public abstract java.lang.String[] getDefaultCipherSuites();

    method public abstract java.lang.String[] getSupportedCipherSuites();

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -73739,7 +73739,6 @@ package javax.net.ssl { 
  public abstract class SSLSocketFactory extends javax.net.SocketFactory {

    ctor public SSLSocketFactory();

    method public abstract java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException;

    method public java.net.Socket createSocket(java.net.Socket, java.io.InputStream, boolean) throws java.io.IOException;

    method public static synchronized javax.net.SocketFactory getDefault();

    method public abstract java.lang.String[] getDefaultCipherSuites();

    method public abstract java.lang.String[] getSupportedCipherSuites();

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -70271,7 +70271,6 @@ package javax.net.ssl { 
  public abstract class SSLSocketFactory extends javax.net.SocketFactory {

    ctor public SSLSocketFactory();

    method public abstract java.net.Socket createSocket(java.net.Socket, java.lang.String, int, boolean) throws java.io.IOException;

    method public java.net.Socket createSocket(java.net.Socket, java.io.InputStream, boolean) throws java.io.IOException;

    method public static synchronized javax.net.SocketFactory getDefault();

    method public abstract java.lang.String[] getDefaultCipherSuites();

    method public abstract java.lang.String[] getSupportedCipherSuites();