diff options
author | Kenny Root <kroot@google.com> | 2013-08-13 17:44:27 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-13 17:44:27 -0700 |
commit | bf15c7cecefba8fdb3070c389a4966f11a8d8656 (patch) | |
tree | f5d8d10bdfded7eba22f0ef18b4fea58619955c3 /core | |
parent | 6f75a73c04ebd5f0ae10e6e89618f492d842ed96 (diff) | |
parent | dceda36b0052aca7a93a265ea6eb8e8fb71cd322 (diff) | |
download | frameworks_base-bf15c7cecefba8fdb3070c389a4966f11a8d8656.zip frameworks_base-bf15c7cecefba8fdb3070c389a4966f11a8d8656.tar.gz frameworks_base-bf15c7cecefba8fdb3070c389a4966f11a8d8656.tar.bz2 |
am dceda36b: am 1c5e33d3: am 3bc3240f: am a6226a2d: am 32c99004: Use hostname verifier directly instead of instance
* commit 'dceda36b0052aca7a93a265ea6eb8e8fb71cd322':
Use hostname verifier directly instead of instance
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/net/SSLCertificateSocketFactory.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index 846443d..70fbe39 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -80,9 +80,6 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { } }; - private static final HostnameVerifier HOSTNAME_VERIFIER = - HttpsURLConnection.getDefaultHostnameVerifier(); - private SSLSocketFactory mInsecureFactory = null; private SSLSocketFactory mSecureFactory = null; private TrustManager[] mTrustManagers = null; @@ -193,7 +190,7 @@ public class SSLCertificateSocketFactory extends SSLSocketFactory { if (session == null) { throw new SSLException("Cannot verify SSL socket without session"); } - if (!HOSTNAME_VERIFIER.verify(hostname, session)) { + if (!HttpsURLConnection.getDefaultHostnameVerifier().verify(hostname, session)) { throw new SSLPeerUnverifiedException("Cannot verify hostname: " + hostname); } } |