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

Commit 57a8d531 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... 

Merge "DO NOT MERGE Remove createSocket(Socket, InputStream, boolean) from APIs." into oc-dr1-dev am: 87587fbd
am: 0cbfb82f

Change-Id: I7c7876d9fe871178be0918f0c8c48218527a18e0
parents 7ac7c16c 0cbfb82f

api/current.txt

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