commit fd84dad8d1079f84739ab5f205dd54b54b12e336
author Kenny Root <kroot@google.com> Tue Mar 28 10:53:27 2017 -0700
committer Kenny Root <kroot@google.com> Thu Apr 20 21:10:40 2017 +0000
tree acd9e053d605bb0c1a2fc0f5dba4589b69d25feb
parent 1149fa6233442eb686d5e8a363e6cf37deb52ed9

Track changes to Conscrypt

Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I2d0c270ab4d5813709d58d0e7b4c1adaaa8b85ff

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