Mark block device as rw before encryptFstab

Some testcases assume that /dev/block/by-name/userdata is writable, but
mount_with_alternatives() will mark block device as RO if mount flag
includes MS_RDONLY. Fix it by marking the block device as RW again.

Test: th
Bug: 319156415
Change-Id: Ic04acd4b6175d3f0aeea88675da44309e8df15e8

parent 5ede70f7

fs_mgr/fs_mgr.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -1550,6 +1550,7 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) {
		}
		encryptable = status;
		if (status == FS_MGR_MNTALL_DEV_NEEDS_METADATA_ENCRYPTION) {
		fs_mgr_set_blk_ro(attempted_entry.blk_device, false);
		if (!call_vdc({"cryptfs", "encryptFstab", attempted_entry.blk_device,
		attempted_entry.mount_point, wiped ? "true" : "false",
		attempted_entry.fs_type, attempted_entry.zoned_device},