Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50d1b2c8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add length parameter to format /data" into main am: 470e1865 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3104681



Change-Id: Ib5d729468fd1e438a6b7b2c3969e8e15d42cd45f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 05f188dd 470e1865

fs_mgr/fs_mgr.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,7 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) { 
                                   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 @@ MountAllResult fs_mgr_mount_all(Fstab* fstab, int mount_mode) { 
                               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";