commit a5ff2b049f1d7997702ef6e0ac96eb1262f788ac
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 14 18:25:15 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 14 18:25:15 2025 -0700
tree 6943d87b8a286fe01350bfcdaf8bde9507ad7101
parent 3f41d215fcfcd6e7c27b2bc8041ec70b700103f1
parent 71f74dc1a617032717c2e842ae2e9ab1fafa7e88

Snap for 13219462 from 71f74dc1a617032717c2e842ae2e9ab1fafa7e88 to 25Q2-release

Change-Id: Ieb54b4dbbd7350b333ca42628526abd72ee4367d

keystore2/aconfig/flags.aconfig

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"

keystore2/src/maintenance.rs

diff --git a/keystore2/src/maintenance.rs b/keystore2/src/maintenance.rs
index 3517286..21e42a3 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| {