Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cefc5a13 authored by Miguel Aranda's avatar Miguel Aranda Committed by Gerrit Code Review
Browse files

Merge "Only use concscrypt certs if directory is nonempty"

parents 1a0ad60b 81f532c9

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ public final class SystemCertificateSource extends DirectoryCertificateSource { 
    private static File getDirectory() {

        // TODO(miguelaranda): figure out correct code path.

        File updatable_dir = new File("/apex/com.android.conscrypt/cacerts");

        if (updatable_dir.exists()) {

        if (updatable_dir.exists() && !(updatable_dir.list().length == 0)) {

            return updatable_dir;

        }

        return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts");