commit f3147f209c9537b30041a521fb4cc5fbd832ff3a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 20 16:18:17 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 20 16:18:17 2017 +0000
tree b1895df1536eccdcb14b0a968ea3eb955f762adf
parent 63d98e08b8b8ed10e1b2969c221fe30ebef2f901
parent 29f72ecdfdba5b0674a96a6fae39b743487098a4

Merge "Switch *_METHOD to a more future-proof pattern."

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 248fa00..1f4d385 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1870,6 +1870,13 @@
 
         String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, uid, ::TYPE_KEYMASTER_10));
         error = mKeyStore->del(filename.string(), ::TYPE_ANY, get_user_id(uid));
+        if(error == ResponseCode::KEY_NOT_FOUND){
+            uid_t euid = get_keystore_euid(uid);
+            if ((euid != uid) && (euid == AID_WIFI)) {
+                filename=mKeyStore->getKeyNameForUidWithDir(name8, euid, ::TYPE_KEYMASTER_10);
+                error=mKeyStore->del(filename.string(), ::TYPE_ANY, get_user_id(euid));
+            }
+        }
         if (!error.isOk()) {
             ALOGI("upgradeKeyBlob keystore->del failed %d", (int)error);
             return;