commit efe309e03d45edb51006dbc6285d6ad4cd2a5423
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 27 09:01:03 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 27 09:01:03 2019 +0000
tree 28901a4b6ff7ca432ac72dacbdffcf43697cc0eb
parent 1e147ad9d0309351b25e3dab3f56fa3e22045044
parent 9e42a5a88bef7017d212cb2d64d365e8aca59c31

Merge "Use public APIs instead of Conscrypt ones"

android/src/android/net/http/HttpsConnection.java

diff --git a/android/src/android/net/http/HttpsConnection.java b/android/src/android/net/http/HttpsConnection.java
index 13387b8..cd5437c 100644
--- a/android/src/android/net/http/HttpsConnection.java
+++ b/android/src/android/net/http/HttpsConnection.java
@@ -18,10 +18,12 @@
 
 import android.content.Context;
 import android.util.Log;
-import com.android.org.conscrypt.Conscrypt;
+import com.android.org.conscrypt.ClientSessionContext;
 import com.android.org.conscrypt.FileClientSessionCache;
-import com.android.org.conscrypt.OpenSSLContextImpl;
 import com.android.org.conscrypt.SSLClientSessionCache;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import javax.net.ssl.SSLContext;
 import org.apache.http.Header;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
@@ -76,7 +78,7 @@
                 cache = FileClientSessionCache.usingDirectory(sessionDir);
             }
 
-            OpenSSLContextImpl sslContext =  (OpenSSLContextImpl) Conscrypt.newPreferredSSLContextSpi();
+            SSLContext sslContext = SSLContext.getInstance("TLS", "AndroidOpenSSL");
 
             // here, trust managers is a single trust-all manager
             TrustManager[] trustManagers = new TrustManager[] {
@@ -95,13 +97,13 @@
                 }
             };
 
-            sslContext.engineInit(null, trustManagers, null);
-            sslContext.engineGetClientSessionContext().setPersistentCache(cache);
+            sslContext.init(null, trustManagers, null);
+            ((ClientSessionContext) sslContext.getClientSessionContext()).setPersistentCache(cache);
 
             synchronized (HttpsConnection.class) {
-                mSslSocketFactory = sslContext.engineGetSocketFactory();
+                mSslSocketFactory = sslContext.getSocketFactory();
             }
-        } catch (KeyManagementException e) {
+        } catch (KeyManagementException | NoSuchAlgorithmException | NoSuchProviderException e) {
             throw new RuntimeException(e);
         } catch (IOException e) {
             throw new RuntimeException(e);