Don\'t fail if a key we want to delete is already deleted

am: ab0b56aef3 Change-Id: I08920a3e330443e7466f0acc924cd21dbebba4c4
8 years ago · 2fa4435fae
parent 00256b54f2 ab0b56aef3
commit 2fa4435fae
1 changed files with 6 additions and 1 deletions
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@ -534,7 +534,12 @@ bool e4crypt_destroy_user_key(userid_t user_id) {
        for (auto const path: get_ce_key_paths(get_ce_key_directory_path(user_id))) {
            success &= android::vold::destroyKey(path);
        }
-        success &= android::vold::destroyKey(get_de_key_path(user_id));
+        auto de_key_path = get_de_key_path(user_id);
+        if (path_exists(de_key_path)) {
+            success &= android::vold::destroyKey(de_key_path);
+        } else {
+            LOG(INFO) << "Not present so not erasing: " << de_key_path;
+        }
    }
    return success;
 }