commit 1eac97ca73d8bd30c5ba158af57b10af7f205278
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jan 10 02:22:53 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 10 02:22:53 2024 +0000
tree 8d99748dd53b4e7313a9a0fa2faaa06b932517aa
parent 951ffacc7b9d660b8c5d2b376612223a50a031e9
parent d0139b45b8732fe0e610e309373f7f1881bccb42

Merge "Mark block device as rw before encryptFstab" into main

fs_mgr/fs_mgr.cpp

diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index b0e2d6d..8c0c1ef 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1550,6 +1550,7 @@
                 }
                 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},