commit 422376ded9d89fd7c980d40ff5f7d7a82344dc0a
author Dan Stoza <stoza@google.com> Tue Apr 25 22:21:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 22:21:13 2017 +0000
tree b048f6a9e8bb5c0861a0f8836d402e6e4c21f2fc
parent ee9240621d40c5639d16a69dbaa94198824532a2
parent 9ab834a4e681489030a56d2454de42e98108d363

Merge "Revert "Fix temporary key deletion after device ID attestation"" into oc-dev am: e3b7240bf5
am: 9ab834a4e6

Change-Id: Ic39f5335dbbc01b4400e154a5e1e3ee8a61d6564

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index a509eea..d5923b5 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 = del(name, callingUid);
+        deletionRc = KS_HANDLE_HIDL_ERROR(dev->deleteKey(hidlKey));
     }
 
     if (!attestationRc.isOk()) {