summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Przemyslaw Szczepaniak <pszczepaniak@google.com> 2017-03-29 13:59:46 +0100
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> 2017-04-06 09:58:18 +0000
commit1607b49d6b7756a494fe0185e4a726fca1af0d95 (patch)
tree8e561b8955654436c7a4d9ab3a43bec556cfcc65
parent9680667b1d889f189e25b3e5e2d44bbd611c0171 (diff)
Track libcore change dfd104e99d15d91dc21137b190fb99cab8a1180b
Test: make -j 32 Bug: 36461944 Change-Id: I2075d03c3143d0582a76d91bcbaccd83c193a552
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--api/test-current.txt1
3 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 9022766d4e8c..e21a9fd3e31a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -67542,6 +67542,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();
diff --git a/api/system-current.txt b/api/system-current.txt
index 8d8318226179..6b0d23625ded 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -71168,6 +71168,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();
diff --git a/api/test-current.txt b/api/test-current.txt
index a4e73e46e529..c5090b1684ca 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -67651,6 +67651,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();