Merge "fastboot: preserve partition_type if wants_wipe=true"

This commit is contained in:
Tom Cherry 2019-08-29 20:24:52 +00:00 committed by Gerrit Code Review
commit 390b48bad2

View file

@ -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, "", "");
}
}
}