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

resolve merge conflicts of 7bf98aa8a0 to pi-dev-plus-aosp

Browse source 
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I08252155f04e8b414f2149d8b29e5e2fff6bcc82
This commit is contained in:
Luis Hector Chavez 2018-06-05 10:10:08 -07:00
commit cf5c9907f5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cryptfs.cpp
View file

@ -1607,7 +1607,9 @@ static int cryptfs_restart_internal(int restart_main)
property_get("ro.crypto.readonly", ro_prop, "");
if (strlen(ro_prop) > 0 && std::stoi(ro_prop)) {
struct fstab_rec* rec = fs_mgr_get_entry_for_mount_point(fstab_default, DATA_MNT_POINT);
rec->flags |= MS_RDONLY;
if (rec) {
rec->flags |= MS_RDONLY;
}
}
/* If that succeeded, then mount the decrypted filesystem */
@ -2948,5 +2950,5 @@ void cryptfs_clear_password()
int cryptfs_isConvertibleToFBE()
{
struct fstab_rec* rec = fs_mgr_get_entry_for_mount_point(fstab_default, DATA_MNT_POINT);
return fs_mgr_is_convertible_to_fbe(rec) ? 1 : 0;
return (rec && fs_mgr_is_convertible_to_fbe(rec)) ? 1 : 0;
}