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

Commit 86dc3f7a authored by Miguel's avatar Miguel Committed by Miguel Aranda
Browse files

Add systemProperty checking for updatable certs and modify tests. 

Allows us to test bothe certificateStores within tests.

Test: atest NetworkSecurityConfigTests
Change-Id: Ie004d2158286b3035d08a381f06abb74c7f2a9f4
parent ceb138df

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

+6 −2
Original line number Diff line number Diff line
@@ -39,9 +39,13 @@ public final class SystemCertificateSource extends DirectoryCertificateSource { 
    }



    private static File getDirectory() {

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

        if ((System.getProperty("system.certs.enabled") != null)

                && (System.getProperty("system.certs.enabled")).equals("true")) {

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

        }

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

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

        if (updatable_dir.exists()

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

            return updatable_dir;

        }

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