commit ab0b56aef33f04f4d7a352d5790b2d9cd9e7d6d3
author Paul Crowley <paulcrowley@google.com> Tue Jul 19 15:29:53 2016 -0700
committer Paul Crowley <paulcrowley@google.com> Thu Jul 21 11:27:15 2016 -0700
tree 96a16838d395ad5003b254f6324962649438ec05
parent abc253884fbd846c5a08122e16e7957cb9be738f

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

This can happen when cleaning up stale users at boot time.

Bug: 30158800
Change-Id: I2733d8d525fc79b7f05eb2225b7e6e14c4da277f

Ext4Crypt.cpp

diff --git a/Ext4Crypt.cpp b/Ext4Crypt.cpp
index 09c33a0..7d65364 100644
--- a/Ext4Crypt.cpp
+++ b/Ext4Crypt.cpp
@@ -534,7 +534,12 @@
         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;
 }