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

Merge "Add systemProperty checking for updatable certs and modify tests."

Browse Source
This commit is contained in:
Miguel Aranda
2023-03-16 14:21:06 +00:00
committed by Gerrit Code Review
parent a59180a4ca 86dc3f7afb
commit 042dc5fb98
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,9 +39,13 @@ public final class SystemCertificateSource extends DirectoryCertificateSource {
} }
private static File getDirectory() { 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"); 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 updatable_dir;
} }
return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts"); return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts");