commit 211dcefb7762c1dcb130f89a282cb4c4f666ec56
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 25 16:02:06 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 25 16:02:07 2017 +0000
tree 44c61f28f0d8229954c0e450e2ee72ae17af3c99
parent 67899de5ade4bc2a6ffae54f2e66cd5d99b67029
parent a65ab425aa8d625c463a7f639cb95d9b2e33a95a

Merge "Fix temporary key deletion after device ID attestation" into oc-dev

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