commit 030ba028e843b62f3381385829991dd83e3b5f56
author Janis Danisevskis <jdanis@google.com> Wed May 26 11:15:30 2021 -0700
committer Janis Danisevskis <jdanis@google.com> Tue Jun 01 14:30:27 2021 -0700
tree 81948b524c4f4733d2cdf79f06c9006e98614e97
parent 0cabd71f515a70103c501de1a0b49ab67168fddd

Keystore 2.0: Move db_utils to database submodule.

Ignore-AOSP-First: No automerge path from AOSP.
Bug: 189470584
Bug: 187862706
Test: N/A
Change-Id: Id4abe50c948140152f83ca4663d7baa890375c6d
Merged-In: Id4abe50c948140152f83ca4663d7baa890375c6d

keystore2/src/database.rs

diff --git a/keystore2/src/database.rs b/keystore2/src/database.rs
index a6c16e9..dc0cefe 100644
--- a/keystore2/src/database.rs
+++ b/keystore2/src/database.rs
@@ -42,22 +42,21 @@
 //! callbacks.
 
 mod perboot;
+pub(crate) mod utils;
 
 use crate::impl_metadata; // This is in db_utils.rs
 use crate::key_parameter::{KeyParameter, Tag};
 use crate::permission::KeyPermSet;
 use crate::utils::{get_current_time_in_milliseconds, watchdog as wd, AID_USER_OFFSET};
 use crate::{
-    db_utils::{self, SqlField},
-    gc::Gc,
-    super_key::USER_SUPER_KEY,
-};
-use crate::{
     error::{Error as KsError, ErrorCode, ResponseCode},
     super_key::SuperKeyType,
 };
+use crate::{gc::Gc, super_key::USER_SUPER_KEY};
 use anyhow::{anyhow, Context, Result};
 use std::{convert::TryFrom, convert::TryInto, ops::Deref, time::SystemTimeError};
+use utils as db_utils;
+use utils::SqlField;
 
 use android_hardware_security_keymint::aidl::android::hardware::security::keymint::{
     HardwareAuthToken::HardwareAuthToken,

keystore2/src/database/utils.rs

diff --git a/keystore2/src/db_utils.rs b/keystore2/src/database/utils.rs
similarity index 100%
rename from keystore2/src/db_utils.rs
rename to keystore2/src/database/utils.rs

keystore2/src/key_parameter.rs

diff --git a/keystore2/src/key_parameter.rs b/keystore2/src/key_parameter.rs
index de142a7..771d609 100644
--- a/keystore2/src/key_parameter.rs
+++ b/keystore2/src/key_parameter.rs
@@ -92,7 +92,7 @@
 
 use std::convert::TryInto;
 
-use crate::db_utils::SqlField;
+use crate::database::utils::SqlField;
 use crate::error::Error as KeystoreError;
 use crate::error::ResponseCode;
 

keystore2/src/lib.rs

diff --git a/keystore2/src/lib.rs b/keystore2/src/lib.rs
index c04c4b0..51316d7 100644
--- a/keystore2/src/lib.rs
+++ b/keystore2/src/lib.rs
@@ -44,7 +44,6 @@
 
 mod attestation_key_utils;
 mod audit_log;
-mod db_utils;
 mod gc;
 mod super_key;