commit 2091c878fd003857da28d7ef88248a1c060def75
author Jaegeuk Kim <jaegeuk@google.com> Tue Apr 23 19:01:26 2024 -0700
committer Jaegeuk Kim <jaegeuk@google.com> Wed May 01 18:20:12 2024 +0000
tree 0a803b66e0871033f75ab1a53f6876a8d311acc2
parent e76fb7a81010b5ecb42450566465b31e66dc5270

Support multiple partition for /data

Bug: 336319772
Change-Id: I92eca566063b7d8ad74a15c7b74d809b452ace72
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index 96f4eaf..d3f2e3e 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -588,24 +588,24 @@
 }
 
 binder::Status VoldNativeService::mountFstab(const std::string& blkDevice,
-                                             const std::string& mountPoint,
-                                             const std::string& zonedDevice) {
+                                             const std::string& mountPoint, bool isZoned,
+                                             const std::vector<std::string>& userDevices) {
     ENFORCE_SYSTEM_OR_ROOT;
     ACQUIRE_LOCK;
 
     return translateBool(fscrypt_mount_metadata_encrypted(blkDevice, mountPoint, false, false,
-                                                          "null", zonedDevice));
+                                                          "null", isZoned, userDevices));
 }
 
 binder::Status VoldNativeService::encryptFstab(const std::string& blkDevice,
                                                const std::string& mountPoint, bool shouldFormat,
-                                               const std::string& fsType,
-                                               const std::string& zonedDevice) {
+                                               const std::string& fsType, bool isZoned,
+                                               const std::vector<std::string>& userDevices) {
     ENFORCE_SYSTEM_OR_ROOT;
     ACQUIRE_LOCK;
 
     return translateBool(fscrypt_mount_metadata_encrypted(blkDevice, mountPoint, true, shouldFormat,
-                                                          fsType, zonedDevice));
+                                                          fsType, isZoned, userDevices));
 }
 
 binder::Status VoldNativeService::setStorageBindingSeed(const std::vector<uint8_t>& seed) {