commit 05863d294e3765254869a1d2c9feb3bba831db79
author Paul Crowley <paulcrowley@google.com> Fri Jul 22 16:53:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 22 16:53:07 2016 +0000
tree 285bba396c7be3a073c3e6c78374c9094b96d3a6
parent 77d41a0ab7e20d20824f94f19cd5c447803f9ecf
parent 2fa4435faecf09cb82737e0f9d3e1b3202f6a507

Don\\'t fail if a key we want to delete is already deleted am: ab0b56aef3
am: 2fa4435fae

Change-Id: Ia94ef7372900449af7fabd2bffeb592f831b073d

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;
 }