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

Browse Source
This commit is contained in:
Eric Biggers
2023-07-18 00:36:11 +00:00
committed by Gerrit Code Review
parent a6cf261f85 11cd7e6894
commit a3cd5a9e90
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

@@ -125,13 +125,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));