commit 67db7b9786be3c1f6fbdf8148faa7db90dc824d6
author Eric Biggers <ebiggers@google.com> Tue Jun 01 17:07:31 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 01 17:07:31 2021 +0000
tree ab19c11f3bb827ad80c6bc9569d135089535c838
parent 54ebfb58066770a682ae0bb5b3124ebd87621ec7
parent d863b2cd4a0c628d5db7c200f2ee7ec6e734fecf

Merge "Remove /data/misc/vold/user_keys/ce/${user_id} when no longer needed"

FsCrypt.cpp

diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index 04def5c..765073d 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -569,9 +569,12 @@
     if (it != s_ephemeral_users.end()) {
         s_ephemeral_users.erase(it);
     } else {
-        for (auto const path : get_ce_key_paths(get_ce_key_directory_path(user_id))) {
+        auto ce_path = get_ce_key_directory_path(user_id);
+        for (auto const path : get_ce_key_paths(ce_path)) {
             success &= android::vold::destroyKey(path);
         }
+        success &= destroy_dir(ce_path);
+
         auto de_key_path = get_de_key_path(user_id);
         if (android::vold::pathExists(de_key_path)) {
             success &= android::vold::destroyKey(de_key_path);