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

Merge "Remove isCertificateEntry check" am: 7d72975c5b

Browse Source 
am: 59919babe0

* commit '59919babe0763980ae0a3977e2701ad2d81a6cbe':
  Remove isCertificateEntry check
This commit is contained in:
Chad Brubaker
2015-11-29 23:56:01 +00:00
committed by android-build-merger
parent 52ae900a29 59919babe0
commit 19c7afab62
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/security/net/config/KeyStoreCertificateSource.java
View File

@@ -47,9 +47,6 @@ class KeyStoreCertificateSource implements CertificateSource {
Set<X509Certificate> certificates = new ArraySet<>(mKeyStore.size()); Set<X509Certificate> certificates = new ArraySet<>(mKeyStore.size());
for (Enumeration<String> en = mKeyStore.aliases(); en.hasMoreElements();) { for (Enumeration<String> en = mKeyStore.aliases(); en.hasMoreElements();) {
String alias = en.nextElement(); String alias = en.nextElement();
if (!mKeyStore.isCertificateEntry(alias)) {
continue;
}
X509Certificate cert = (X509Certificate) mKeyStore.getCertificate(alias); X509Certificate cert = (X509Certificate) mKeyStore.getCertificate(alias);
if (cert != null) { if (cert != null) {
certificates.add(cert); certificates.add(cert);