Merge "Log the consequences of watch_apex_info failing" into main am: 28ec99d83a am: 11194d9c77
Original change: https://android-review.googlesource.com/c/platform/system/security/+/3531657
Change-Id: I9b648d93bdc95b5ec245ef60f010c2f8d5cff51c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/src/maintenance.rs b/keystore2/src/maintenance.rs
index 7b6ea68..3517286 100644
--- a/keystore2/src/maintenance.rs
+++ b/keystore2/src/maintenance.rs
@@ -251,7 +251,7 @@
if keystore2_flags::attest_modules() {
std::thread::spawn(move || {
Self::watch_apex_info()
- .unwrap_or_else(|e| log::error!("watch_apex_info failed: {e:?}"));
+ .unwrap_or_else(|e| log::error!("watch_apex_info failed, preventing keystore.module_hash.sent from being set to true; this may therefore block boot: {e:?}"));
});
} else {
rustutils::system_properties::write("keystore.module_hash.sent", "true")