commit f6151b434ce259d79496242635654856797bc4c1
author Jaegeuk Kim <jaegeuk@google.com> Tue Dec 15 09:02:29 2020 -0800
committer Jaegeuk Kim <jaegeuk@google.com> Tue Jun 07 18:43:54 2022 -0700
tree e265f81113578e0413e573acd22012b8c75bfe0e
parent 3712b8de010853b68673b34de24eb6a7fe697983

Support zoned device with dm-default-key

Note that, encrypt_inplace cannot support zoned device, since it
doesn't support in-place updates. And, dm-default-key will have
a different key.

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

VoldNativeService.h

diff --git a/VoldNativeService.h b/VoldNativeService.h
index 423e8f9..4feeada 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -103,9 +103,11 @@
     binder::Status fbeEnable();
 
     binder::Status initUser0();
-    binder::Status mountFstab(const std::string& blkDevice, const std::string& mountPoint);
+    binder::Status mountFstab(const std::string& blkDevice, const std::string& mountPoint,
+                              const std::string& zonedDevice);
     binder::Status encryptFstab(const std::string& blkDevice, const std::string& mountPoint,
-                                bool shouldFormat, const std::string& fsType);
+                                bool shouldFormat, const std::string& fsType,
+                                const std::string& zonedDevice);
 
     binder::Status setStorageBindingSeed(const std::vector<uint8_t>& seed);