Merge "Track changes to Conscrypt" am: b53397b37a am: bdf30de9bc am: 375c136144
am: ea6caa4bbc
Change-Id: I63e06547057eb8619e51a439e107d3fb792cb310
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;
}