diff options
| author | 2023-01-12 11:23:48 +0000 | |
|---|---|---|
| committer | 2023-01-12 11:23:48 +0000 | |
| commit | 837db55aeca413fabf45bd400ff8594c970d8c18 (patch) | |
| tree | 8bce4bc0142d4096a7adea9452eb4963653f21ac | |
| parent | f4c768b7e9efee352466c3fab4f4e8fac0ce87a9 (diff) | |
| parent | d74c5ab44f4bf792284db5d01282b8f259d7cd45 (diff) | |
Merge "Only use concscrypt certs if directory is nonempty" am: cefc5a13e9 am: d74c5ab44f
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>
| -rw-r--r-- | core/java/android/security/net/config/SystemCertificateSource.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/security/net/config/SystemCertificateSource.java b/core/java/android/security/net/config/SystemCertificateSource.java index 48923126117a..13f7e5d4232b 100644 --- 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"); |