From a2507e876421ce5276c63a7437a2a668da124563 Mon Sep 17 00:00:00 2001 From: Alex Klyubin Date: Fri, 21 Mar 2014 11:13:50 -0700 Subject: Adjust to the change in the private SSLParameterImpl API. Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to getDefaultX509TrustManager. Bug: 13563574 Change-Id: I601c651d631f5a2e4a04d21941186553988e5286 --- core/java/android/net/http/CertificateChainValidator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/java/android/net/http') 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); -- cgit v1.1