Merge "Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b" am: 443af115ab am: 9bc30db050 am: 20d95d9ed9

am: b9a8fe0bd9

Change-Id: Ic746f92f0d23c5ef8b072d84e2f0d8c075dfeb89
This commit is contained in:
Przemyslaw Szczepaniak
2017-04-06 15:16:32 +00:00
committed by android-build-merger
3 changed files with 3 additions and 0 deletions

View File

@@ -69984,6 +69984,7 @@ 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();

View File

@@ -73851,6 +73851,7 @@ 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();

View File

@@ -70401,6 +70401,7 @@ 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();