summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Klyubin <klyubin@google.com> 2014-03-21 11:13:50 -0700
committer Alex Klyubin <klyubin@google.com> 2014-03-21 11:13:50 -0700
commita2507e876421ce5276c63a7437a2a668da124563 (patch)
treee1f1b093cf5d6e2b8b01a25cb73cbdf8addd43fa
parent4308a5230e2887c1ee12e7bdc60e0b93212637ab (diff)
Adjust to the change in the private SSLParameterImpl API.
Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to getDefaultX509TrustManager. Bug: 13563574 Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
-rw-r--r--core/java/android/net/http/CertificateChainValidator.java4
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);