Merge "Note that dump output is parsed elsewhere" into main
diff --git a/keystore2/aconfig/flags.aconfig b/keystore2/aconfig/flags.aconfig
index b15230e..9161de8 100644
--- a/keystore2/aconfig/flags.aconfig
+++ b/keystore2/aconfig/flags.aconfig
@@ -26,14 +26,6 @@
}
flag {
- name: "enable_dump"
- namespace: "hardware_backed_security"
- description: "Include support for dump() on the IKeystoreMaintenance service"
- bug: "344987718"
- is_fixed_read_only: true
-}
-
-flag {
name: "import_previously_emulated_keys"
namespace: "hardware_backed_security"
description: "Include support for importing keys that were previously software-emulated into KeyMint"
diff --git a/keystore2/src/maintenance.rs b/keystore2/src/maintenance.rs
index dc15fd9..4116bc5 100644
--- a/keystore2/src/maintenance.rs
+++ b/keystore2/src/maintenance.rs
@@ -513,10 +513,6 @@
f: &mut dyn std::io::Write,
_args: &[&std::ffi::CStr],
) -> Result<(), binder::StatusCode> {
- if !keystore2_flags::enable_dump() {
- log::info!("skipping dump() as flag not enabled");
- return Ok(());
- }
log::info!("dump()");
let _wp = wd::watch("IKeystoreMaintenance::dump");
check_dump_permission().map_err(|_e| {