okhttp: enable TLS 1.3 for servers on Android

ejona86 · ejona86 · commit 3018ce341c8f · 2026-06-05T14:06:52.000-07:00
f430131 enabled TLS 1.3 for okhttp clients on Android.
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static final class ServerCredentials extends io.grpc.ServerCredentials {`
`41`	`41`	`private final ConnectionSpec connectionSpec;`
`42`	`42`
`43`	`43`	`ServerCredentials(SSLSocketFactory factory) {`
`44`		`- this(factory, OkHttpChannelBuilder.INTERNAL_LEGACY_CONNECTION_SPEC);`
	`44`	`+ this(factory, OkHttpChannelBuilder.initialConnectionSpec());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`ServerCredentials(SSLSocketFactory factory, ConnectionSpec connectionSpec) {`