From 803df6f26d7190bd4c0f0ec7d23f684e061ed513 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Fri, 1 May 2026 10:15:42 -0700 Subject: [PATCH] okhttp: enable TLS 1.3 for servers on Android f43013161 enabled TLS 1.3 for okhttp clients on Android. --- okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java | 2 +- .../java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java index 43bc92af092..2f267472071 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java +++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java @@ -208,7 +208,7 @@ public static OkHttpChannelBuilder forTarget(String target, ChannelCredentials c */ private final boolean useGetForSafeMethods = false; - private static ConnectionSpec initialConnectionSpec() { + static ConnectionSpec initialConnectionSpec() { return (OkHttpProtocolNegotiator.get() instanceof OkHttpProtocolNegotiator.AndroidNegotiator) ? INTERNAL_DEFAULT_CONNECTION_SPEC : INTERNAL_LEGACY_CONNECTION_SPEC; diff --git a/okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java b/okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java index ad9af056afc..0c04aa63fad 100644 --- a/okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java +++ b/okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java @@ -41,7 +41,7 @@ static final class ServerCredentials extends io.grpc.ServerCredentials { private final ConnectionSpec connectionSpec; ServerCredentials(SSLSocketFactory factory) { - this(factory, OkHttpChannelBuilder.INTERNAL_LEGACY_CONNECTION_SPEC); + this(factory, OkHttpChannelBuilder.initialConnectionSpec()); } ServerCredentials(SSLSocketFactory factory, ConnectionSpec connectionSpec) {