diff options
author | Kenny Root <kroot@google.com> | 2017-05-05 21:45:28 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 21:45:28 +0000 |
commit | 500c9e4449235bbbedf9dc03e185a8165afc5acc (patch) | |
tree | acd9e053d605bb0c1a2fc0f5dba4589b69d25feb | |
parent | 8dd2df5e3954d5a4a862e229922e848c94a3daf3 (diff) | |
parent | ea6caa4bbc8fc1cad5f57867a1a0f015b69c6a1b (diff) | |
download | okhttp-500c9e4449235bbbedf9dc03e185a8165afc5acc.tar.gz |
Merge "Track changes to Conscrypt" am: b53397b37a am: bdf30de9bc am: 375c136144
am: ea6caa4bbc
Change-Id: I63e06547057eb8619e51a439e107d3fb792cb310
-rw-r--r-- | android/test/java/com/squareup/okhttp/internal/PlatformTest.java | 10 |
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; } |