commit 0c841556b8c75c4f49df03a7a97ee00f6a40c474
author Daeho Jeong <daehojeong@google.com> Mon Oct 21 14:05:31 2024 -0700
committer Daeho Jeong <daehojeong@google.com> Tue Oct 22 17:40:18 2024 +0000
tree 7e9a45aa928ef5367bbf2e417a140b74bd797302
parent 0b7388489fd289fc455e0d97abb0d7644909b965

add f2fs device aliasing related arguments in vold

To support f2fs device aliasing feature, include related arguments in
vold.

Bug: 336319772
Test: add a device with "exp_alias" tag in fstab
Change-Id: Ibb8766f4c77d532a596f5581f3de8dfb334ba2fd
Signed-off-by: Daeho Jeong <daehojeong@google.com>

vdc.cpp

diff --git a/vdc.cpp b/vdc.cpp
index 9764b1a..400bc5d 100644
--- a/vdc.cpp
+++ b/vdc.cpp
@@ -114,10 +114,22 @@
     if (args[8] != "") {
         userDevices = android::base::Split(args[8], " ");
     }
+    std::vector<std::string> deviceAliasedStr = {};
+    std::vector<bool> deviceAliased = {};
+    if (args[9] != "") {
+        deviceAliasedStr = android::base::Split(args[9], " ");
+        for (auto aliased : deviceAliasedStr) {
+            if (aliased == "0") {
+                deviceAliased.push_back(false);
+            } else {
+                deviceAliased.push_back(true);
+            }
+        }
+    }
     checkStatus(args, vold->encryptFstab(args[2], args[3],
                                          shouldFormat == android::base::ParseBoolResult::kTrue,
                                          args[5], isZoned == android::base::ParseBoolResult::kTrue,
-                                         userDevices, length));
+                                         userDevices, deviceAliased, length));
 }
 
 int main(int argc, char** argv) {
@@ -164,7 +176,7 @@
         bindkeys(args, vold);
     } else if (args[0] == "cryptfs" && args[1] == "mountFstab" && args.size() == 6) {
         mountFstab(args, vold);
-    } else if (args[0] == "cryptfs" && args[1] == "encryptFstab" && args.size() == 9) {
+    } else if (args[0] == "cryptfs" && args[1] == "encryptFstab" && args.size() == 10) {
         encryptFstab(args, vold);
     } else if (args[0] == "checkpoint" && args[1] == "supportsCheckpoint" && args.size() == 2) {
         bool supported = false;