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

Commit 92ec0a0c authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

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

* commit 'd8c32164':
  Adjust to the change in the private SSLParameterImpl API.
parents cf0c4a59 d8c32164

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);