Revert "Keystore 2.0: Move keymint spec to security namespace."
Revert "Keystore 2.0: Move keymint spec to security namespace."
Revert "Move keymint to android.hardware.security."
Revert "Configure CF to start KeyMint service by default."
Revert "Move keymint to android.hardware.security."
Revert "Move keymint to android.hardware.security."
Revert submission 1522123-move_keymint
Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.
Change-Id: Ia87e90b9e514fed4e05c5b129308a745e1dc2316
diff --git a/keystore2/src/utils.rs b/keystore2/src/utils.rs
index 66f3db6..1c678c3 100644
--- a/keystore2/src/utils.rs
+++ b/keystore2/src/utils.rs
@@ -18,7 +18,7 @@
use crate::permission;
use crate::permission::{KeyPerm, KeyPermSet, KeystorePerm};
use crate::{error::Error, key_parameter::KeyParameterValue};
-use android_hardware_security_keymint::aidl::android::hardware::security::keymint::{
+use android_hardware_keymint::aidl::android::hardware::keymint::{
KeyCharacteristics::KeyCharacteristics, SecurityLevel::SecurityLevel,
};
use android_system_keystore2::aidl::android::system::keystore2::{