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

Commit 7e810bd6 authored by Tom Cherry's avatar Tom Cherry Committed by android-build-merger
Browse files

Merge "fastboot: preserve partition_type if wants_wipe=true" 

am: 390b48ba

Change-Id: I5338320ddac7dde9da45c218620a98827052c333
parents 148062f2 390b48ba

fastboot/fastboot.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2058,10 +2058,10 @@ int FastBootTool::Main(int argc, char* argv[]) { 
            if (partition == "userdata" && set_fbe_marker) {

                fprintf(stderr, "setting FBE marker on initial userdata...\n");

                std::string initial_userdata_dir = create_fbemarker_tmpdir();

                fb_perform_format(partition, 1, "", "", initial_userdata_dir);

                fb_perform_format(partition, 1, partition_type, "", initial_userdata_dir);

                delete_fbemarker_tmpdir(initial_userdata_dir);

            } else {

                fb_perform_format(partition, 1, "", "", "");

                fb_perform_format(partition, 1, partition_type, "", "");

            }

        }

    }