commit 19c7afab6244303e78bbc6b5ab04520bbd4172d7
author Chad Brubaker <cbrubaker@google.com> Sun Nov 29 23:56:01 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 29 23:56:01 2015 +0000
tree 97465a684c21374365202aa84a44c4f732d7fcc2
parent 52ae900a291844b6454fdb5f9edf65abb95c6fa9
parent 59919babe0763980ae0a3977e2701ad2d81a6cbe

Merge "Remove isCertificateEntry check" am: 7d72975c5b
am: 59919babe0

* commit '59919babe0763980ae0a3977e2701ad2d81a6cbe':
  Remove isCertificateEntry check

core/java/android/security/net/config/KeyStoreCertificateSource.java

diff --git a/core/java/android/security/net/config/KeyStoreCertificateSource.java b/core/java/android/security/net/config/KeyStoreCertificateSource.java
index 1973ef1..9167a90 100644
--- a/core/java/android/security/net/config/KeyStoreCertificateSource.java
+++ b/core/java/android/security/net/config/KeyStoreCertificateSource.java
@@ -47,9 +47,6 @@
                 Set<X509Certificate> certificates = new ArraySet<>(mKeyStore.size());
                 for (Enumeration<String> en = mKeyStore.aliases(); en.hasMoreElements();) {
                     String alias = en.nextElement();
-                    if (!mKeyStore.isCertificateEntry(alias)) {
-                        continue;
-                    }
                     X509Certificate cert = (X509Certificate) mKeyStore.getCertificate(alias);
                     if (cert != null) {
                         certificates.add(cert);