Merge "Wipe metadata when we wipe userdata and cache."

am: f88905d231

Change-Id: I92163caab6e2e65565d80bcf7f3661eec757afb1
This commit is contained in:
Paul Crowley 2018-04-25 13:49:57 -07:00 committed by android-build-merger
commit 9f5aa032f8

View file

@ -1644,20 +1644,20 @@ int FastBoot::Main(int argc, char* argv[]) {
}
if (wants_wipe) {
fb_queue_erase("userdata");
if (set_fbe_marker) {
fprintf(stderr, "setting FBE marker on initial userdata...\n");
std::string initial_userdata_dir = create_fbemarker_tmpdir();
fb_perform_format(transport, "userdata", 1, "", "", initial_userdata_dir);
delete_fbemarker_tmpdir(initial_userdata_dir);
} else {
fb_perform_format(transport, "userdata", 1, "", "", "");
}
std::string cache_type;
if (fb_getvar(transport, "partition-type:cache", &cache_type) && !cache_type.empty()) {
fb_queue_erase("cache");
fb_perform_format(transport, "cache", 1, "", "", "");
std::vector<std::string> partitions = { "userdata", "cache", "metadata" };
for (const auto& partition : partitions) {
std::string partition_type;
if (!fb_getvar(transport, std::string{"partition-type:"} + partition, &partition_type)) continue;
if (partition_type.empty()) continue;
fb_queue_erase(partition);
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(transport, partition, 1, "", "", initial_userdata_dir);
delete_fbemarker_tmpdir(initial_userdata_dir);
} else {
fb_perform_format(transport, partition, 1, "", "", "");
}
}
}
if (wants_set_active) {