From 3120b33204fc48a6375aed3ab26831aa7f17bb02 Mon Sep 17 00:00:00 2001
From: Adam Vartanian <flooey@google.com>
Date: Thu, 8 Jun 2017 14:43:05 +0100
Subject: [PATCH] DO NOT MERGE Remove createSocket(Socket, InputStream,
 boolean) from APIs.

This method wasn't intended to be new API for DR1.

Bug: 62428936
Test: make
Change-Id: I5c0d523d0f61ab544cd987fa92daefcc79fc0732
---
 api/current.txt        | 1 -
 api/system-current.txt | 1 -
 api/test-current.txt   | 1 -
 3 files changed, 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index a71c63ae598c2..02a0a4ee6f26b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -69846,7 +69846,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();
diff --git a/api/system-current.txt b/api/system-current.txt
index fbe210925ab3d..68a11e7aec756 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -73764,7 +73764,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();
diff --git a/api/test-current.txt b/api/test-current.txt
index d586670b53f90..6463dfd7ad1c0 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -70266,7 +70266,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();