okhttp: Don't warn about missing Conscrypt

ejona86 · ejona86 · commit 6f3542297c2f · 2024-10-02T16:03:53.000-07:00
When running on the JDK, it is quite normal for Conscrypt not to be
present. We'll end up using the JDK 9 ALPN API and everything will be
fine. On Android, it would be extremely rare for someone to completely
remove the default Android security providers, so the warning was almost
never going to trigger on that platform anyway.
diff --git a/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java b/okhttp/third_party/okhttp/main/java/io/grpc/okhttp/internal/Platform.java
@@ -283,7 +283,7 @@ private static boolean isAtLeastAndroid41() {
 
   /**
    * Select the first recognized security provider according to the preference order returned by
-   * {@link Security#getProviders}. If a recognized provider is not found then warn but continue.
+   * {@link Security#getProviders}.
    */
   private static Provider getAndroidSecurityProvider() {
     Provider[] providers = Security.getProviders();
@@ -295,7 +295,6 @@ private static Provider getAndroidSecurityProvider() {
         }
       }
     }
-    logger.log(Level.WARNING, "Unable to find Conscrypt");
     return null;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ private static boolean isAtLeastAndroid41() {`
`283`	`283`
`284`	`284`	`/**`
`285`	`285`	`* Select the first recognized security provider according to the preference order returned by`
`286`		`- * {@link Security#getProviders}. If a recognized provider is not found then warn but continue.`
	`286`	`+ * {@link Security#getProviders}.`
`287`	`287`	`*/`
`288`	`288`	`private static Provider getAndroidSecurityProvider() {`
`289`	`289`	`Provider[] providers = Security.getProviders();`
`@@ -295,7 +295,6 @@ private static Provider getAndroidSecurityProvider() {`
`295`	`295`	`}`
`296`	`296`	`}`
`297`	`297`	`}`
`298`		`- logger.log(Level.WARNING, "Unable to find Conscrypt");`
`299`	`298`	`return null;`
`300`	`299`	`}`
`301`	`300`