Merge "Remove isCertificateEntry check" am: 7d72975c5b

am: 59919babe0

* commit '59919babe0763980ae0a3977e2701ad2d81a6cbe':
  Remove isCertificateEntry check

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

@@ -47,9 +47,6 @@ class KeyStoreCertificateSource implements CertificateSource {
                 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);