Adjust to the change in the private SSLParameterImpl API.
Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to
getDefaultX509TrustManager.
Bug: 13563574
Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
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);