From 86dc3f7afbc06ec63a41c592403721f9c66f85f4 Mon Sep 17 00:00:00 2001 From: Miguel Date: Tue, 7 Feb 2023 11:24:03 +0000 Subject: [PATCH] Add systemProperty checking for updatable certs and modify tests. Allows us to test bothe certificateStores within tests. Test: atest NetworkSecurityConfigTests Change-Id: Ie004d2158286b3035d08a381f06abb74c7f2a9f4 --- .../security/net/config/SystemCertificateSource.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/security/net/config/SystemCertificateSource.java b/core/java/android/security/net/config/SystemCertificateSource.java index 13f7e5d4232b8..3a254c1d92fc7 100644 --- a/core/java/android/security/net/config/SystemCertificateSource.java +++ b/core/java/android/security/net/config/SystemCertificateSource.java @@ -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");