commit 0c52c7125f02d77d428307e5c3f8a445e6fbaecf
author Jaegeuk Kim <jaegeuk@google.com> Tue Dec 15 09:00:49 2020 -0800
committer Jaegeuk Kim <jaegeuk@google.com> Tue Dec 22 11:28:50 2020 -0800
tree d4fdeb09c18033a46768e5bd4631958cffa7629b
parent 168893621b5216ff3cecbdd294bea82d8e6cdf7a

Let vold format the encrypted partition

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

VoldNativeService.h

diff --git a/VoldNativeService.h b/VoldNativeService.h
index 0a55af4..8fd6261 100644
--- a/VoldNativeService.h
+++ b/VoldNativeService.h
@@ -111,7 +111,8 @@
     binder::Status initUser0();
     binder::Status isConvertibleToFbe(bool* _aidl_return);
     binder::Status mountFstab(const std::string& blkDevice, const std::string& mountPoint);
-    binder::Status encryptFstab(const std::string& blkDevice, const std::string& mountPoint);
+    binder::Status encryptFstab(const std::string& blkDevice, const std::string& mountPoint,
+                                bool shouldFormat, const std::string& fsType);
 
     binder::Status createUserKey(int32_t userId, int32_t userSerial, bool ephemeral);
     binder::Status destroyUserKey(int32_t userId);