Merge "Add length parameter to format /data" into main am: 470e186547
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3104681
Change-Id: Ib5d729468fd1e438a6b7b2c3969e8e15d42cd45f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fs_mgr/fs_mgr.cpp b/fs_mgr/fs_mgr.cpp
index 7f41cea..5156754 100644
--- a/fs_mgr/fs_mgr.cpp
+++ b/fs_mgr/fs_mgr.cpp
@@ -1556,6 +1556,7 @@
attempted_entry.mount_point, wiped ? "true" : "false",
attempted_entry.fs_type,
attempted_entry.fs_mgr_flags.is_zoned ? "true" : "false",
+ std::to_string(attempted_entry.length),
android::base::Join(attempted_entry.user_devices, ' ')},
nullptr)) {
LERROR << "Encryption failed";
@@ -1601,6 +1602,7 @@
current_entry.mount_point, "true" /* shouldFormat */,
current_entry.fs_type,
current_entry.fs_mgr_flags.is_zoned ? "true" : "false",
+ std::to_string(current_entry.length),
android::base::Join(current_entry.user_devices, ' ')},
nullptr)) {
LERROR << "Encryption failed";