| commit | d439c6190e217780329f747d18e9683fce8a5002 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Aug 09 17:47:23 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 09 17:47:23 2024 +0000 |
| tree | e093dc8e62454d0da5c9bbf1126c040a6983555f | |
| parent | 12af3c29e5fa09358df16f9a286380f12594356f [diff] | |
| parent | 70c4c4f886cb4b4d72b2768659d151ffe2d01516 [diff] |
Merge "SystemCertificateSource: Mitigate NPE when checking updateable certs directory" into main am: b7e715d8d9 am: 70c4c4f886 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3165417 Change-Id: Ibe25e36d666597428caa28ec7666dbdacce1e171 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/security/net/config/SystemCertificateSource.java b/core/java/android/security/net/config/SystemCertificateSource.java index 3a254c1..bdda42a 100644 --- a/core/java/android/security/net/config/SystemCertificateSource.java +++ b/core/java/android/security/net/config/SystemCertificateSource.java
@@ -19,6 +19,8 @@ import android.os.Environment; import android.os.UserHandle; +import com.android.internal.util.ArrayUtils; + import java.io.File; /** @@ -45,7 +47,7 @@ } File updatable_dir = new File("/apex/com.android.conscrypt/cacerts"); if (updatable_dir.exists() - && !(updatable_dir.list().length == 0)) { + && !(ArrayUtils.isEmpty(updatable_dir.list()))) { return updatable_dir; } return new File(System.getenv("ANDROID_ROOT") + "/etc/security/cacerts");