Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only use concscrypt certs if directory is nonempty"

Browse Source
This commit is contained in:
Miguel Aranda
2023-01-12 10:16:03 +00:00
committed by Gerrit Code Review
parent 1a0ad60b54 81f532c9a0
commit cefc5a13e9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/security/net/config/SystemCertificateSource.java
View File

@@ -41,7 +41,7 @@ public final class SystemCertificateSource extends DirectoryCertificateSource {
private static File getDirectory() { private static File getDirectory() {
// TODO(miguelaranda): figure out correct code path. // TODO(miguelaranda): figure out correct code path.
File updatable_dir = new File("/apex/com.android.conscrypt/cacerts"); 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 updatable_dir;
} }
return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts"); return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts");