commit 53b4ffad7e2cae2f4f52d04084fde139d05046a3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 08 18:02:52 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 08 18:02:53 2016 +0000
tree e8d05ecdf212f903d4603c1e302f0fed07b522ea
parent cb9842abce009f256d690ddb3a9f055907ae550c
parent 2f7db3158912b0b1e1b50765122765cfc7151f7e

Merge "Fix issue: upgradeKeyBlob call always return PERMISSION_DENIED."

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 99a0057..d68c367 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1664,12 +1664,12 @@
     UniquePtr<uint8_t, Malloc_Delete> upgraded_key_deleter(
         const_cast<uint8_t*>(upgraded_key.key_material));
 
-    rc = del(name, uid);
+    String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, uid, ::TYPE_KEYMASTER_10));
+    rc = mKeyStore->del(filename.string(), ::TYPE_ANY, get_user_id(uid));
     if (rc != ::NO_ERROR) {
         return rc;
     }
 
-    String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, uid, ::TYPE_KEYMASTER_10));
     Blob newBlob(upgraded_key.key_material, upgraded_key.key_material_size, nullptr /* info */,
                  0 /* infoLength */, ::TYPE_KEYMASTER_10);
     newBlob.setFallback(blob->isFallback());