Merge "Remove obsolete comment from FileIntegrityService" into main am: a3cd5a9e90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2661275 Change-Id: I95a9307dfab939032369ca173a19d46a5503a945 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -125,13 +125,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));
|
||||
|
||||
Reference in New Issue
Block a user