commit b53397b37a05fd50529810c726e7214cdc5b191e
author Kenny Root <kroot@google.com> Fri May 05 21:00:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 05 21:00:41 2017 +0000
tree acd9e053d605bb0c1a2fc0f5dba4589b69d25feb
parent 1149fa6233442eb686d5e8a363e6cf37deb52ed9
parent fd84dad8d1079f84739ab5f205dd54b54b12e336

Merge "Track changes to Conscrypt"

android/test/java/com/squareup/okhttp/internal/PlatformTest.java

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 @@
     }
   };
 
-  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;
     }