commit eb3182f0407fe0628d0da3716ae94dda680d97f8
author David Anderson <dvander@google.com> Mon Sep 27 20:01:24 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 27 20:01:24 2021 +0000
tree 6b6ec6420eb5dc390e4d28bdeb3c7cd199509b4d
parent d718c8c577e00f633dd7b56254d8bb19f3404cd5
parent 156d9d2293780c7b5331915fec4bc4727252c838

Merge "Pre-create userdata metadata encryption device."

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index ef4c41e..8b2b960 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -125,7 +125,9 @@
     auto dir = metadata_key_dir + "/key";
     LOG(DEBUG) << "metadata_key_dir/key: " << dir;
     if (!MkdirsSync(dir, 0700)) return false;
-    if (!pathExists(dir)) {
+    auto in_dsu = android::base::GetBoolProperty("ro.gsid.image_running", false);
+    // !pathExists(dir) does not imply there's a factory reset when in DSU mode.
+    if (!pathExists(dir) && !in_dsu) {
         auto delete_all = android::base::GetBoolProperty(
                 "ro.crypto.metadata_init_delete_all_keys.enabled", false);
         if (delete_all) {