From c20c2ea28ea755a40263545c34adffe72f675a60 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Mon, 26 Jun 2017 20:03:03 +0100
Subject: [PATCH] Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.

Tracks the revert of the corresponding conscrypt CL.

This reverts commit 7fdce769c3ef3885ec8f1716bdeedfc8b056a1d7.

This is a clean revert. The upload hook to fix lint errors was not run
(this CL was uploaded with --no-verify).

Test: Treehugger
Test: make droid cts
Bug: 62424503

Change-Id: I5b8728575c4c02de10fff227ba40ec6ddc7ffa46
---
 core/java/android/net/SSLCertificateSocketFactory.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java
index 0b1569ca4ff58..b56437eba1672 100644
--- a/core/java/android/net/SSLCertificateSocketFactory.java
+++ b/core/java/android/net/SSLCertificateSocketFactory.java
@@ -20,7 +20,6 @@ import android.os.SystemProperties;
 import android.util.Log;
 
 import com.android.internal.os.RoSystemProperties;
-import com.android.org.conscrypt.Conscrypt;
 import com.android.org.conscrypt.OpenSSLContextImpl;
 import com.android.org.conscrypt.OpenSSLSocketImpl;
 import com.android.org.conscrypt.SSLClientSessionCache;
@@ -213,7 +212,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory {
     private SSLSocketFactory makeSocketFactory(
             KeyManager[] keyManagers, TrustManager[] trustManagers) {
         try {
-            OpenSSLContextImpl sslContext =  (OpenSSLContextImpl) Conscrypt.newPreferredSSLContextSpi();
+            OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred();
             sslContext.engineInit(keyManagers, trustManagers, null);
             sslContext.engineGetClientSessionContext().setPersistentCache(mSessionCache);
             return sslContext.engineGetSocketFactory();