Merge "Add possibility to get deleted system Certificate Aliases" into lmp-dev

1ffe43e8 · Zoltan Szatmary-Ban · Android (Google) Code Review · ad0cd830 · f11be684 · 1ffe43e8
Commit 1ffe43e8 authored 10 years ago by Zoltan Szatmary-Ban Committed by Android (Google) Code Review 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

src/platform/java/org/conscrypt/TrustedCertificateStore.java src/platform/java/org/conscrypt/TrustedCertificateStore.java +5 -1

No files found.
--- a/src/platform/java/org/conscrypt/TrustedCertificateStore.java
+++ b/src/platform/java/org/conscrypt/TrustedCertificateStore.java
@@ -275,6 +275,10 @@ public final class TrustedCertificateStore {
    }

    public String getCertificateAlias(Certificate c) {
+        return getCertificateAlias(c, false);
+    }
+
+    public String getCertificateAlias(Certificate c, boolean includeDeletedSystem) {
        if (c == null || !(c instanceof X509Certificate)) {
            return null;
        }
@@ -283,7 +287,7 @@ public final class TrustedCertificateStore {
        if (user.exists()) {
            return PREFIX_USER + user.getName();
        }
-        if (isDeletedSystemCertificate(x)) {
+        if (!includeDeletedSystem && isDeletedSystemCertificate(x)) {
            return null;
        }
        File system = getCertificateFile(systemDir, x);