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

Commit 5d90c239 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Remove obsolete comment from FileIntegrityService" into main am:...

Merge "Remove obsolete comment from FileIntegrityService" into main am: a3cd5a9e am: 35ed783c am: 0f579212

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



Change-Id: I1cc0f60bc6cc04fd0ced370bea4c3e1f6147001e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7da406d7 0f579212
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -184,13 +184,7 @@ public class FileIntegrityService extends SystemService {
    }

    private void loadAllCertificates() {
        // A better alternative to load certificates would be to read from .fs-verity kernel
        // keyring, which fsverity_init loads to during earlier boot time from the same sources
        // below. But since the read operation from keyring is not provided in kernel, we need to
        // duplicate the same loading logic here.

        // Load certificates trusted by the device manufacturer.
        // NB: Directories need to be synced with system/security/fsverity_init/fsverity_init.cpp.
        final String relativeDir = "etc/security/fsverity";
        loadCertificatesFromDirectory(Environment.getRootDirectory().toPath()
                .resolve(relativeDir));