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

am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."

Browse Source 
* commit '7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
  Adjust to the change in the private SSLParameterImpl API.
This commit is contained in:
Alex Klyubin
2014-03-24 17:34:11 +00:00
committed by Android Git Automerger
parent 6640f6be41 7ae93b1d0c
commit f96bfe86a6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);