Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove obsolete comment from FileIntegrityService" into main am: a3cd5a9e90 am: 35ed783c43

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

Change-Id: Ib9aac93b868c3def276d1ed742b03b07c77b79c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-07-18 01:53:22 +00:00
committed by Automerger Merge Worker
parent 383344b5dc 35ed783c43
commit 0f579212fa
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/security/FileIntegrityService.java
View File

@@ -184,13 +184,7 @@ public class FileIntegrityService extends SystemService {
} }
private void loadAllCertificates() { 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. // 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"; final String relativeDir = "etc/security/fsverity";
loadCertificatesFromDirectory(Environment.getRootDirectory().toPath() loadCertificatesFromDirectory(Environment.getRootDirectory().toPath()
.resolve(relativeDir)); .resolve(relativeDir));