Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2507e87 authored by Alex Klyubin's avatar Alex Klyubin
Browse files

Adjust to the change in the private SSLParameterImpl API. 

Conscrypt's SSLParameterImpl getDefaultTrustManager was renamed to
getDefaultX509TrustManager.

Bug: 13563574
Change-Id: I601c651d631f5a2e4a04d21941186553988e5286
parent 4308a523

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

+2 −2
Original line number Diff line number Diff line
@@ -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);