summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQilin Tan <qilin.tan@mediatek.com>2020-11-02 11:25:09 +0800
committerMichael Bestas <mkbestas@lineageos.org>2021-03-21 13:54:09 +0100
commit0fdfe77d30f67f3075a6809802f88e5416c95d0e (patch)
tree00812cc6df675f25f5fa0f9d7bd29bfc3ca6af2d
parentba44a4024dd998f5c78dedaee3fdb9d5a2175bdb (diff)
Store result of mount_all for mounted userdata by metadata encryption
When the userdata is mounted, its result will be stored and return. But the result is not stored when the userdata is mounted with metadata encryption. Store the result of metadata encryption mount. Bug: 172180818 Test: run cts-on-gsi -m CtsUserspaceRebootHostSideTestCases Change-Id: I88b1b4f6a2b1ed81773e18243cb6c46244dc1ba5
-rw-r--r--fs_mgr/fs_mgr.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index fdb352eae..fc70edd7f 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1523,6 +1523,8 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) {
attempted_entry.mount_point},
nullptr)) {
++error_count;
+ } else if (current_entry.mount_point == "/data") {
+ userdata_mounted = true;
}
encryptable = FS_MGR_MNTALL_DEV_IS_METADATA_ENCRYPTED;
continue;