Remove duplicate code and add fn for flag check
Test: atest CtsKeystoreTestCases
Change-Id: I47975e028896ebe5777bae8efe8b17507bb36500
diff --git a/keystore2/legacykeystore/lib.rs b/keystore2/legacykeystore/lib.rs
index cf61482..a665405 100644
--- a/keystore2/legacykeystore/lib.rs
+++ b/keystore2/legacykeystore/lib.rs
@@ -127,12 +127,7 @@
}
fn put(&mut self, caller_uid: u32, alias: &str, entry: &[u8]) -> Result<()> {
- if keystore2_flags::disable_legacy_keystore_put_v2() {
- return Err(Error::deprecated()).context(concat!(
- "Storing into Keystore's legacy database is ",
- "no longer supported, store in an app-specific database instead"
- ));
- }
+ ensure_keystore_put_is_enabled()?;
self.with_transaction(TransactionBehavior::Immediate, |tx| {
tx.execute(
"INSERT OR REPLACE INTO profiles (owner, alias, profile) values (?, ?, ?)",
@@ -257,6 +252,17 @@
)
}
+fn ensure_keystore_put_is_enabled() -> Result<()> {
+ if keystore2_flags::disable_legacy_keystore_put_v2() {
+ Err(Error::deprecated()).context(concat!(
+ "Storing into Keystore's legacy database is ",
+ "no longer supported, store in an app-specific database instead"
+ ))
+ } else {
+ Ok(())
+ }
+}
+
struct LegacyKeystoreDeleteListener {
legacy_keystore: Arc<LegacyKeystore>,
}
@@ -349,12 +355,7 @@
}
fn put(&self, alias: &str, uid: i32, entry: &[u8]) -> Result<()> {
- if keystore2_flags::disable_legacy_keystore_put_v2() {
- return Err(Error::deprecated()).context(concat!(
- "Storing into Keystore's legacy database is ",
- "no longer supported, store in an app-specific database instead"
- ));
- }
+ ensure_keystore_put_is_enabled()?;
let uid = Self::get_effective_uid(uid).context("In put.")?;
let mut db = self.open_db().context("In put.")?;
db.put(uid, alias, entry).context("In put: Trying to insert entry into DB.")?;