diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-03-24 17:34:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 17:34:11 +0000 |
| commit | f96bfe86a68bfd0491a76cf6dfa515dc58f027bb (patch) | |
| tree | 8f9c106be2c373da550dc247797e446a13936e80 /core/java/android/net/http | |
| parent | 6640f6be412e7454bfa7d457670e83aba46ea28c (diff) | |
| parent | 7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3 (diff) | |
| download | frameworks_base-f96bfe86a68bfd0491a76cf6dfa515dc58f027bb.zip frameworks_base-f96bfe86a68bfd0491a76cf6dfa515dc58f027bb.tar.gz frameworks_base-f96bfe86a68bfd0491a76cf6dfa515dc58f027bb.tar.bz2 | |
am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
Adjust to the change in the private SSLParameterImpl API.
Diffstat (limited to 'core/java/android/net/http')
| -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); |