diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-03-21 18:46:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 18:46:49 +0000 |
| commit | 8e0787f3082f1b66e17c035e876683e42eaee896 (patch) | |
| tree | 49089f5f4c57f0199d1a5e9b45c820ac0b922322 /core | |
| parent | e0a0d0a911b2dc641a882860800a9b4bcb2e6848 (diff) | |
| parent | d8c32164e19d16cf7d66b9aee368369ae16a4f0d (diff) | |
| download | frameworks_base-8e0787f3082f1b66e17c035e876683e42eaee896.zip frameworks_base-8e0787f3082f1b66e17c035e876683e42eaee896.tar.gz frameworks_base-8e0787f3082f1b66e17c035e876683e42eaee896.tar.bz2 | |
am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit 'd8c32164e19d16cf7d66b9aee368369ae16a4f0d':
Adjust to the change in the private SSLParameterImpl API.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/http/CertificateChainValidator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/http/CertificateChainValidator.java b/core/java/android/net/http/CertificateChainValidator.java index 3652a4c..1e476fc 100644 --- a/core/java/android/net/http/CertificateChainValidator.java +++ b/core/java/android/net/http/CertificateChainValidator.java @@ -138,7 +138,7 @@ public class CertificateChainValidator { public static void handleTrustStorageUpdate() { try { - X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager(); + X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultX509TrustManager(); if( x509TrustManager instanceof TrustManagerImpl ) { TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager; trustManager.handleTrustStorageUpdate(); @@ -175,7 +175,7 @@ public class CertificateChainValidator { } try { - X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager(); + X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultX509TrustManager(); if (x509TrustManager instanceof TrustManagerImpl) { TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager; trustManager.checkServerTrusted(chain, authType, domain); |