diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-03-21 18:53:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 18:53:20 +0000 |
| commit | 7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3 (patch) | |
| tree | bc4abcc3fb13746dc03fe2d8d1962ba67c89c856 /core/java/android | |
| parent | b8846c819e43535250b004dde593892fa305b7e7 (diff) | |
| parent | 92ec0a0c7a568a77696964c16f4e44292c633ef1 (diff) | |
am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '92ec0a0c7a568a77696964c16f4e44292c633ef1':
Adjust to the change in the private SSLParameterImpl API.
Diffstat (limited to 'core/java/android')
| -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 3652a4c12a19..1e476fcf7d0c 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); |