Revert "Track changes to Conscrypt". DO NOT MERGE ANYWHERE.oreo-dr1-dev

Tracking the revert of the corresponding conscrypt CL.

This reverts commit fd84dad8d1079f84739ab5f205dd54b54b12e336.

This is a clean revert. The upload hook to fix lint errors was not run
(this CL was uploaded with --no-verify).

Test: Treehugger
Test: make droid cts
Bug: 62424503

Change-Id: I2fa2e23a24940588e32ebfb08bb8b38a5c20d0cb

1 files changed, 9 insertions, 1 deletions

diff --git a/android/test/java/com/squareup/okhttp/internal/PlatformTest.java b/android/test/java/com/squareup/okhttp/internal/PlatformTest.java
index 6765c00..9735913 100644
--- a/android/test/java/com/squareup/okhttp/internal/PlatformTest.java
+++ b/android/test/java/com/squareup/okhttp/internal/PlatformTest.java
@@ -121,23 +121,31 @@ public class PlatformTest {
     }
   };
 
-  private static class FullOpenSSLSocketImpl extends TestSSLSocketImpl {
+  private static class FullOpenSSLSocketImpl extends OpenSSLSocketImpl {
     private boolean useSessionTickets;
     private String hostname;
     private byte[] alpnProtocols;
 
+    public FullOpenSSLSocketImpl() throws IOException {
+      super(null);
+    }
+
+    @Override
     public void setUseSessionTickets(boolean useSessionTickets) {
       this.useSessionTickets = useSessionTickets;
     }
 
+    @Override
     public void setHostname(String hostname) {
       this.hostname = hostname;
     }
 
+    @Override
     public void setAlpnProtocols(byte[] alpnProtocols) {
       this.alpnProtocols = alpnProtocols;
     }
 
+    @Override
     public byte[] getAlpnSelectedProtocol() {
       return alpnProtocols;
     }