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

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

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

* commit '88517170':
  Adjust to the change in the private SSLParameterImpl API.
parents e4360c8e 88517170

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ public class CertificateChainValidator { 
    public static void handleTrustStorageUpdate() {

    public static void handleTrustStorageUpdate() {





        try {

        try {

            X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager();

            X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultX509TrustManager();

            if( x509TrustManager instanceof TrustManagerImpl ) {

            if( x509TrustManager instanceof TrustManagerImpl ) {

                TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager;

                TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager;

                trustManager.handleTrustStorageUpdate();

                trustManager.handleTrustStorageUpdate();
@@ -175,7 +175,7 @@ public class CertificateChainValidator { 
        }

        }





        try {

        try {

            X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager();

            X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultX509TrustManager();

            if (x509TrustManager instanceof TrustManagerImpl) {

            if (x509TrustManager instanceof TrustManagerImpl) {

                TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager;

                TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager;

                trustManager.checkServerTrusted(chain, authType, domain);

                trustManager.checkServerTrusted(chain, authType, domain);