diff options
author | Selim Gurun <sgurun@google.com> | 2012-02-15 19:04:58 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-15 19:04:58 -0800 |
commit | d8d6afdc068e8aa31fddd06f5946311d2b961026 (patch) | |
tree | 7d43a0d1b13be8ddbc87b4d53126cc01581a1b2a /core/java/android/net | |
parent | 8963822068a43738dce3a4a799a73ea99487298e (diff) | |
parent | 43e41580e4c700e970cc5e62180a767ab424da6d (diff) | |
download | frameworks_base-d8d6afdc068e8aa31fddd06f5946311d2b961026.zip frameworks_base-d8d6afdc068e8aa31fddd06f5946311d2b961026.tar.gz frameworks_base-d8d6afdc068e8aa31fddd06f5946311d2b961026.tar.bz2 |
Merge "Revert "Act on credential storage updates.""
Diffstat (limited to 'core/java/android/net')
-rw-r--r-- | core/java/android/net/http/CertificateChainValidator.java | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/core/java/android/net/http/CertificateChainValidator.java b/core/java/android/net/http/CertificateChainValidator.java index 06c6c6e..f94d320 100644 --- a/core/java/android/net/http/CertificateChainValidator.java +++ b/core/java/android/net/http/CertificateChainValidator.java @@ -25,17 +25,15 @@ import javax.net.ssl.DefaultHostnameVerifier; import javax.net.ssl.SSLHandshakeException; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; -import javax.net.ssl.X509TrustManager; import org.apache.harmony.security.provider.cert.X509CertImpl; import org.apache.harmony.xnet.provider.jsse.SSLParametersImpl; -import org.apache.harmony.xnet.provider.jsse.TrustManagerImpl; /** * Class responsible for all server certificate validation functionality * * {@hide} */ -public class CertificateChainValidator { +class CertificateChainValidator { /** * The singleton instance of the certificate chain validator @@ -124,18 +122,6 @@ public class CertificateChainValidator { } /** - * Handles updates to credential storage. - */ - public static void handleTrustStorageUpdate() { - - X509TrustManager x509TrustManager = SSLParametersImpl.getDefaultTrustManager(); - if( x509TrustManager instanceof TrustManagerImpl ) { - TrustManagerImpl trustManager = (TrustManagerImpl) x509TrustManager; - trustManager.handleTrustStorageUpdate(); - } - } - - /** * Common code of doHandshakeAndValidateServerCertificates and verifyServerCertificates. * Calls DomainNamevalidator to verify the domain, and TrustManager to verify the certs. * @param chain the cert chain in X509 cert format. |