Remove flag enable_dump
Since this flag was launched, remove it and make the corresponding code
unconditional.
Bug: 344987718
Test: presubmit
Flag: EXEMPT removing android.security.keystore2.enable_dump
Ignore-AOSP-First: N/A
Change-Id: I9040b7377cb19bba7f6ec3f14605b98b285044a3
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 7b6ea68..2c84a37 100644
--- a/keystore2/src/maintenance.rs
+++ b/keystore2/src/maintenance.rs
@@ -510,10 +510,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| {