commit 31f87b72f1b6881478c07a7e59e2bf991555c51a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Jun 24 01:17:39 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jun 24 01:17:39 2023 +0000
tree 3b18321e3352a617c051dd2048a161fce2ad0ec8
parent ed99c0bdbc6f4e7bae9ca0e0fc0676700c6e55da
parent a4b20ffedb827675afeb7e605cea3f218da73b84

Merge "Remove dead code from fs_mgr" am: 50d89e6351 am: 79fecb2f8d am: 66ac89b173 am: 8da4142839 am: a4b20ffedb

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

Change-Id: Ied130273ddd2204d5718a5165a8e4b2f8bca17c5
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 dbd8fd1..395cc02 100644
--- a/MetadataCrypt.cpp
+++ b/MetadataCrypt.cpp
@@ -102,9 +102,8 @@
         PLOG(ERROR) << "Failed to setexeccon";
         return false;
     }
-    auto mount_rc = fs_mgr_do_mount(&fstab_default, const_cast<char*>(mount_point),
-                                    const_cast<char*>(blk_device), nullptr,
-                                    android::vold::cp_needsCheckpoint(), true, needs_encrypt);
+    auto mount_rc = fs_mgr_do_mount(&fstab_default, mount_point, blk_device,
+                                    android::vold::cp_needsCheckpoint(), needs_encrypt);
     if (setexeccon(nullptr)) {
         PLOG(ERROR) << "Failed to clear setexeccon";
         return false;