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

Commit e68f8b7e authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid... 

am 405d4db5: Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters

Merge commit '405d4db5' into gingerbread-plus-aosp

* commit '405d4db5':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
parents 0535d857 405d4db5

core/java/android/net/SSLCertificateSocketFactory.java

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import javax.net.ssl.X509TrustManager; 
import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;

import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;

import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;

import org.apache.harmony.xnet.provider.jsse.SSLParameters;



/**

 * SSLSocketFactory implementation with several extra features:

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

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.net.http; 


import com.android.internal.net.DomainNameValidator;



import org.apache.harmony.xnet.provider.jsse.SSLParameters;

import org.apache.harmony.xnet.provider.jsse.SSLParametersImpl;



import java.io.IOException;
@@ -191,7 +191,7 @@ class CertificateChainValidator { 
        // report back to the user.

        //

        try {

            SSLParameters.getDefaultTrustManager().checkServerTrusted(

            SSLParametersImpl.getDefaultTrustManager().checkServerTrusted(

                newServerCertificates, "RSA");



            // no errors!!!