release-request-8e9fa75e-c690-4b43-a1d5-5c0fb9845968-for-git_oc-dr1-release-4153147 snap-temp-L41900000079521085android-8.0.0_r34android-8.0.0_r33android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21oreo-dr3-releaseoreo-dr2-releaseoreo-dr1-release

Change-Id: I810ff81541881d70289e2d40812a16800bfe6708

2 files changed, 3 insertions, 4 deletions

diff --git a/android/src/android/net/http/CertificateChainValidator.java b/android/src/android/net/http/CertificateChainValidator.java
index f338da6..96bf169 100644
--- a/android/src/android/net/http/CertificateChainValidator.java
+++ b/android/src/android/net/http/CertificateChainValidator.java
@@ -16,7 +16,7 @@
 
 package android.net.http;
 
-import com.android.org.conscrypt.Conscrypt;
+import com.android.org.conscrypt.SSLParametersImpl;
 import com.android.org.conscrypt.TrustManagerImpl;
 
 import android.util.Log;
@@ -227,7 +227,7 @@ public class CertificateChainValidator {
         }
 
         try {
-            X509TrustManager x509TrustManager = Conscrypt.getDefaultX509TrustManager();
+            X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultX509TrustManager();
             // Use duck-typing to try and call the hostname aware checkServerTrusted if
             // available.
             try {
diff --git a/android/src/android/net/http/HttpsConnection.java b/android/src/android/net/http/HttpsConnection.java
index 13387b8..213537b 100644
--- a/android/src/android/net/http/HttpsConnection.java
+++ b/android/src/android/net/http/HttpsConnection.java
@@ -18,7 +18,6 @@ package android.net.http;
 
 import android.content.Context;
 import android.util.Log;
-import com.android.org.conscrypt.Conscrypt;
 import com.android.org.conscrypt.FileClientSessionCache;
 import com.android.org.conscrypt.OpenSSLContextImpl;
 import com.android.org.conscrypt.SSLClientSessionCache;
@@ -76,7 +75,7 @@ public class HttpsConnection extends Connection {
                 cache = FileClientSessionCache.usingDirectory(sessionDir);
             }
 
-            OpenSSLContextImpl sslContext =  (OpenSSLContextImpl) Conscrypt.newPreferredSSLContextSpi();
+            OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();
 
             // here, trust managers is a single trust-all manager
             TrustManager[] trustManagers = new TrustManager[] {