commit ee9240621d40c5639d16a69dbaa94198824532a2
author Bartosz Fabianowski <bartfab@google.com> Tue Apr 25 16:07:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 16:07:52 2017 +0000
tree 44c61f28f0d8229954c0e450e2ee72ae17af3c99
parent 536018dba3787381e05545ff58a282b35429ac97
parent 536b42987c5f91d525a2ed31b30c02298e1fd90d

Merge "Fix temporary key deletion after device ID attestation" into oc-dev am: 211dcefb77
am: 536b42987c

Change-Id: I438220bb32893e3fccb4150c96b5761416ee40b5

keystore/key_store_service.cpp

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()) {