commit b7e715d8d900f0095cfd66be459f9960c36651ff
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Aug 09 16:50:49 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 09 16:50:49 2024 +0000
tree ce17820e4797236db7189ebdcfbd48385183a084
parent 0ef98b7d9ef0387b801d676dc3243f7f85408c80
parent 0e5d7184731a35c1057b5fa8799a0ac5d097792a

Merge "SystemCertificateSource: Mitigate NPE when checking updateable certs directory" into main

core/java/android/security/net/config/SystemCertificateSource.java

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");