Only use concscrypt certs if directory is nonempty

Test: atest TrustedCertificateStoreTest
Bug: 264540110
Change-Id: I5ac47315d3e9cfacb53d27080046a3fd8cfb7878
This commit is contained in:
Miguel
2023-01-11 16:44:06 +00:00
committed by Miguel Aranda
parent 15bc01b949
commit 81f532c9a0

View File

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