commit 3afff91fb72a2ae0e0fe82144997b699fe1142fd
author Dan Stoza <stoza@google.com> Tue Apr 25 17:23:16 2017 +0000
committer Dan Stoza <stoza@google.com> Tue Apr 25 17:23:16 2017 +0000
tree cc83c99b12deefd049915929432857b486db1443
parent a65ab425aa8d625c463a7f639cb95d9b2e33a95a

Revert "Fix temporary key deletion after device ID attestation"

This reverts commit a65ab425aa8d625c463a7f639cb95d9b2e33a95a.

Reason for revert: Breaks Ryu build

Change-Id: I57c760b561cbbfcb1f0191e8309fc678461dba36

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index a8b635e..a28a35a 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1392,7 +1392,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()) {