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" am: cefc5a13e9 am: d74c5ab44f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2384453

Change-Id: Icc8bbf37b3ec62235f33718382566b40a7bf94ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miguel Aranda
2023-01-12 11:23:48 +00:00
committed by Automerger Merge Worker
parent f4c768b7e9 d74c5ab44f
commit 837db55aec
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");