Merge "Track changes to Conscrypt"

am: b53397b37a

Change-Id: I62b5a1627514231a02b7f05714e8256508529036

1 files changed, 1 insertions, 9 deletions

diff --git a/android/test/java/com/squareup/okhttp/internal/PlatformTest.java b/android/test/java/com/squareup/okhttp/internal/PlatformTest.java
index 9735913..6765c00 100644
--- a/android/test/java/com/squareup/okhttp/internal/PlatformTest.java
+++ b/android/test/java/com/squareup/okhttp/internal/PlatformTest.java
@@ -121,31 +121,23 @@ public class PlatformTest {
     }
   };
 
-  private static class FullOpenSSLSocketImpl extends OpenSSLSocketImpl {
+  private static class FullOpenSSLSocketImpl extends TestSSLSocketImpl {
     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;
     }