Merge "Only use concscrypt certs if directory is nonempty"

2023-01-12 10:16:03 +00:00
parent 1a0ad60b54 81f532c9a0
commit cefc5a13e9
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/security/net/config/SystemCertificateSource.java
+++ b/core/java/android/security/net/config/SystemCertificateSource.java
@@ -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");