Snap for 13204655 from 139ec29c0efde374ea61a26e3e182df780db98fe to 25Q2-release
Change-Id: I42e6821392d85b4888ffa924dc87be24c881f914
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 9b96f36..7ba873b 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -5,6 +5,3 @@
[Builtin Hooks Options]
clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
rustfmt = --config-path=rustfmt.toml
-
-[Hook Scripts]
-aosp_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "."
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")