diff options
| author | Kenny Root <kroot@google.com> | 2014-11-03 18:40:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-03 18:40:55 +0000 |
| commit | d00ced983ee235f72a9261fd967309a2638dde05 (patch) | |
| tree | 586467b5d780f1844b1936b4ba98bf84b0b6cf40 /core/java/android/net/http | |
| parent | 10ac55ba4f0beed608b310c473bb052cbcdf19c1 (diff) | |
| parent | b0cb07348e6320ce51d0e8b88d240ecf834850d1 (diff) | |
| download | frameworks_base-d00ced983ee235f72a9261fd967309a2638dde05.zip frameworks_base-d00ced983ee235f72a9261fd967309a2638dde05.tar.gz frameworks_base-d00ced983ee235f72a9261fd967309a2638dde05.tar.bz2 | |
am b0cb0734: Merge "Track change to Conscrypt"
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
Track change to Conscrypt
Diffstat (limited to 'core/java/android/net/http')
| -rw-r--r-- | core/java/android/net/http/HttpsConnection.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/http/HttpsConnection.java b/core/java/android/net/http/HttpsConnection.java index 6bf01e2..a8674de 100644 --- a/core/java/android/net/http/HttpsConnection.java +++ b/core/java/android/net/http/HttpsConnection.java @@ -79,7 +79,7 @@ public class HttpsConnection extends Connection { cache = FileClientSessionCache.usingDirectory(sessionDir); } - OpenSSLContextImpl sslContext = new OpenSSLContextImpl(); + OpenSSLContextImpl sslContext = OpenSSLContextImpl.getPreferred(); // here, trust managers is a single trust-all manager TrustManager[] trustManagers = new TrustManager[] { |