commit 4e26514ca3fc895df0c43d6a12b2d51e5adfe5e3
author Bartosz Fabianowski <bartfab@google.com> Thu Apr 27 00:26:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 00:26:55 2017 +0000
tree 44c61f28f0d8229954c0e450e2ee72ae17af3c99
parent 422376ded9d89fd7c980d40ff5f7d7a82344dc0a
parent abedb7877581967a865453e9c442db353f84116e

Fix temporary key deletion after device ID attestation am: e0256a8dbb
am: abedb78775

Change-Id: I416d758ef6943b09071f3e0a836825504cb12a3e

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