Revert "[rkpd_client] Add Error type to rkpd_client"
This reverts commit 2dbabf3b7232781d61faba97865a061b3bae5fd9.
Reason for revert: DroidMonitor revert for b/310139666
Bug: 310139666
Change-Id: I1213940cc4e3112038c1cc66f5a218a9378d6b0f
diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index f2b332b..830fbe1 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -19,9 +19,7 @@
log_key_deleted, log_key_generated, log_key_imported, log_key_integrity_violation,
};
use crate::database::{BlobInfo, CertificateInfo, KeyIdGuard};
-use crate::error::{
- self, map_km_error, map_or_log_err, wrapped_rkpd_error_to_ks_error, Error, ErrorCode,
-};
+use crate::error::{self, map_km_error, map_or_log_err, Error, ErrorCode};
use crate::globals::{
get_remotely_provisioned_component_name, DB, ENFORCEMENTS, LEGACY_IMPORTER, SUPER_KEY,
};
@@ -902,11 +900,8 @@
f,
|upgraded_blob| {
let _wp = wd::watch_millis("Calling store_rkpd_attestation_key()", 500);
- if let Err(e) = store_rkpd_attestation_key(&rpc_name, key_blob, upgraded_blob) {
- Err(wrapped_rkpd_error_to_ks_error(&e)).context(format!("{e:?}"))
- } else {
- Ok(())
- }
+ store_rkpd_attestation_key(&rpc_name, key_blob, upgraded_blob)
+ .context(ks_err!("Failed store_rkpd_attestation_key()."))
},
)
.context(ks_err!())