commit 88517170cbb09b45324d5b457a0e5e840cc7d09b
author Alex Klyubin <klyubin@google.com> Fri Mar 21 18:36:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 21 18:36:08 2014 +0000
tree e1f1b093cf5d6e2b8b01a25cb73cbdf8addd43fa
parent 4308a5230e2887c1ee12e7bdc60e0b93212637ab
parent a2507e876421ce5276c63a7437a2a668da124563

Merge "Adjust to the change in the private SSLParameterImpl API."

core/java/android/net/http/CertificateChainValidator.java

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 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 @@
         }
 
         try {
-            X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager();
+            X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultX509TrustManager();
             if (x509TrustManager instanceof TrustManagerImpl) {
                 TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager;
                 trustManager.checkServerTrusted(chain, authType, domain);