Merge "Fix temporary key deletion after device ID attestation" into oc-dev
diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index d5923b5..a509eea 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1402,7 +1402,7 @@
if (attestingDeviceIds) {
// When performing device id attestation, treat the key as ephemeral and delete it straight
// away.
- deletionRc = KS_HANDLE_HIDL_ERROR(dev->deleteKey(hidlKey));
+ deletionRc = del(name, callingUid);
}
if (!attestationRc.isOk()) {