commit d8c32164e19d16cf7d66b9aee368369ae16a4f0d
author Alex Klyubin <klyubin@google.com> Fri Mar 21 11:41:38 2014 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 21 11:41:38 2014 -0700
tree 4bffe0ec37809688b6dfae7797cfbaf08deacab0
parent e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00
parent 88517170cbb09b45324d5b457a0e5e840cc7d09b

am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."

* commit '88517170cbb09b45324d5b457a0e5e840cc7d09b':
  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);