diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-03-21 18:36:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-21 18:36:08 +0000 |
| commit | 88517170cbb09b45324d5b457a0e5e840cc7d09b (patch) | |
| tree | e1f1b093cf5d6e2b8b01a25cb73cbdf8addd43fa | |
| parent | 4308a5230e2887c1ee12e7bdc60e0b93212637ab (diff) | |
| parent | a2507e876421ce5276c63a7437a2a668da124563 (diff) | |
| download | frameworks_base-88517170cbb09b45324d5b457a0e5e840cc7d09b.zip frameworks_base-88517170cbb09b45324d5b457a0e5e840cc7d09b.tar.gz frameworks_base-88517170cbb09b45324d5b457a0e5e840cc7d09b.tar.bz2 | |
Merge "Adjust to the change in the private SSLParameterImpl API."
| -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); |