commit 8da9e2efe75c097c3c96ceda2ee4d5e42d70dd5e
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 23 01:39:51 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 23 01:39:51 2023 +0000
tree 1e7de69668e0a32880ce863de17981d102fecb77
parent 4801c65d8ee5cd06a0be3c47484d7f392a373108
parent 2f773b6ee0626e654da77e0b9e37b837a22f4074

Merge "Don't Skip Checkpointing for F2fs" am: 4bc9e2517b am: 7045aeba50 am: 2f773b6ee0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2634095

Change-Id: I9efc54b3b4cc1a7acdcac58b06e887475177c25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

MetadataCrypt.cpp

diff --git a/MetadataCrypt.cpp b/MetadataCrypt.cpp
index 0c32c3b..dbd8fd1 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -104,8 +104,7 @@
     }
     auto mount_rc = fs_mgr_do_mount(&fstab_default, const_cast<char*>(mount_point),
                                     const_cast<char*>(blk_device), nullptr,
-                                    needs_encrypt? false: android::vold::cp_needsCheckpoint(),
-                                    true);
+                                    android::vold::cp_needsCheckpoint(), true, needs_encrypt);
     if (setexeccon(nullptr)) {
         PLOG(ERROR) << "Failed to clear setexeccon";
         return false;