tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I992421fa9fa3b99b3dd653248d6ea75b9f150443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-06-24 00:05:50 +00:00 committed by Automerger Merge Worker
commit a4b20ffedb
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
MetadataCrypt.cpp
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;