commit 67f9044ab5b871f36db42e9f863c88b57c30e4a3
author Paul Lawrence <paullawrence@google.com> Fri Jun 12 08:12:48 2020 -0700
committer Paul Lawrence <paullawrence@google.com> Thu Jun 18 21:58:32 2020 +0000
tree 937015dd42f4160f43b52cc234caca9bc130300b
parent cbb69e548a927b4ec2933e1033f955d88004db25

Don't call block checkpoint functions above dm-default-key

Bug: 156225476
Test: Build for f2fs and ext4 device, make sure checkpoints roll back
and commit

Merged-In: Ic15fadc67d306463dd0b554f679306d8f9081451
Change-Id: Ic15fadc67d306463dd0b554f679306d8f9081451

MetadataCrypt.cpp

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