Keystore 2.0: Add more watch points.
This patch adds watch points on all calls into keymint, on get_aaid, and
calls to the permission controller.
Test: N/A
Change-Id: If5b85fd1ad5c33e08ba9fd25f5cb0c76be747d3e
diff --git a/keystore2/src/globals.rs b/keystore2/src/globals.rs
index 9f38799..b640326b 100644
--- a/keystore2/src/globals.rs
+++ b/keystore2/src/globals.rs
@@ -20,6 +20,7 @@
use crate::legacy_blob::LegacyBlobLoader;
use crate::legacy_migrator::LegacyMigrator;
use crate::super_key::SuperKeyManager;
+use crate::utils::watchdog as wd;
use crate::utils::Asp;
use crate::{async_task::AsyncTask, database::MonotonicRawTime};
use crate::{
@@ -58,6 +59,7 @@
Box::new(|uuid, blob| {
let km_dev: Strong<dyn IKeyMintDevice> =
get_keymint_dev_by_uuid(uuid).map(|(dev, _)| dev)?.get_interface()?;
+ let _wp = wd::watch_millis("In create_thread_local_db: calling deleteKey", 500);
map_km_error(km_dev.deleteKey(&*blob))
.context("In invalidate key closure: Trying to invalidate key blob.")
}),
@@ -227,8 +229,10 @@
.context("In connect_keymint: Trying to get Legacy wrapper.")
}?;
+ let wp = wd::watch_millis("In connect_keymint: calling getHardwareInfo()", 500);
let hw_info = map_km_error(keymint.getHardwareInfo())
.context("In connect_keymint: Failed to get hardware info.")?;
+ drop(wp);
Ok((Asp::new(keymint.as_binder()), hw_info))
}