Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '405d4db50b3db1fc5e015475218e190d193332d4' into gingerbread-plus-aosp

* commit '405d4db50b3db1fc5e015475218e190d193332d4':
  Rename internal SSLParameters to SSLParametersImpl to avoid collision with new javax.net.ssl.SSLParameters
This commit is contained in:
Brian Carlstrom
2010-09-14 11:29:57 -07:00
committed by Android Git Automerger
parent 0535d8577f 405d4db50b
commit e68f8b7ebe
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/net/SSLCertificateSocketFactory.java
View File

@@ -49,7 +49,6 @@ import javax.net.ssl.X509TrustManager;
import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl; import org.apache.harmony.xnet.provider.jsse.OpenSSLContextImpl;
import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl; import org.apache.harmony.xnet.provider.jsse.OpenSSLSocketImpl;
import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache; import org.apache.harmony.xnet.provider.jsse.SSLClientSessionCache;
import org.apache.harmony.xnet.provider.jsse.SSLParameters;
/** /**
* SSLSocketFactory implementation with several extra features: * SSLSocketFactory implementation with several extra features:

4
core/java/android/net/http/CertificateChainValidator.java
View File

@@ -19,7 +19,7 @@ package android.net.http;
import com.android.internal.net.DomainNameValidator; 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; import java.io.IOException;
@@ -191,7 +191,7 @@ class CertificateChainValidator {
// report back to the user. // report back to the user.
// //
try { try {
SSLParameters.getDefaultTrustManager().checkServerTrusted( SSLParametersImpl.getDefaultTrustManager().checkServerTrusted(
newServerCertificates, "RSA"); newServerCertificates, "RSA");
// no errors!!! // no errors!!!