Merge "Remove dead code from fs_mgr"

This commit is contained in:
Treehugger Robot 2023-06-23 20:07:09 +00:00 committed by Gerrit Code Review
commit 50d89e6351

View file

@ -102,9 +102,8 @@ static bool mount_via_fs_mgr(const char* mount_point, const char* blk_device, bo
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;