Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c4c4f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SystemCertificateSource: Mitigate NPE when checking updateable certs... 

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

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



Change-Id: Ibea0d8e830fc22fd1312b5413f93d22a188b141c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47c449bc b7e715d8

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

+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package android.security.net.config; 
import android.os.Environment;

import android.os.UserHandle;



import com.android.internal.util.ArrayUtils;



import java.io.File;



/**
@@ -45,7 +47,7 @@ public final class SystemCertificateSource extends DirectoryCertificateSource { 
        }

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