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

Commit d74c5ab4 authored by Miguel Aranda's avatar Miguel Aranda Committed by Automerger Merge Worker
Browse files

Merge "Only use concscrypt certs if directory is nonempty" am: cefc5a13 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2384453



Change-Id: I1c79641e46b256371691b4d4f55052fd7680ec25
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea87ce19 cefc5a13

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");