commit 708744a964a99fb407a48b0ddebf62f0354d6483
author Shawn Willden <swillden@google.com> Fri Dec 11 13:05:27 2020 +0000
committer Shawn Willden <swillden@google.com> Fri Dec 11 20:36:49 2020 +0000
tree 7db19422ac675a5ee712313af931579286e3f34c
parent 594bea1b4838f5bfe4f51b1590810ae4f593471a

Revert "Revert "Keystore 2.0: Move keymint spec to security name..."

Revert "Revert "Keystore 2.0: Move keymint spec to security name..."

Revert^2 "Remove references to keymint1"

34536a352803a08776cc4f373d93a94e1fcbf98e

Bug: 175345910
Bug: 171429297
Change-Id: Ib500ff822958804b4aa031c114b7520fa70cd84d

keystore2/src/error.rs

diff --git a/keystore2/src/error.rs b/keystore2/src/error.rs
index 49d72bb..b4cf913 100644
--- a/keystore2/src/error.rs
+++ b/keystore2/src/error.rs
@@ -32,7 +32,7 @@
 
 use std::cmp::PartialEq;
 
-pub use android_hardware_keymint::aidl::android::hardware::keymint::ErrorCode::ErrorCode;
+pub use android_hardware_security_keymint::aidl::android::hardware::security::keymint::ErrorCode::ErrorCode;
 pub use android_system_keystore2::aidl::android::system::keystore2::ResponseCode::ResponseCode;
 
 use keystore2_selinux as selinux;