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

Commit 405d4db5 authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Rename internal SSLParameters to SSLParametersImpl to avoid collision with new... 

Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters

Bug: 2672817
Change-Id: Ibe20830f024f76232f3628cfca922d49a5a06bef
parent 94126238

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!!!