Merge "Cleaned up slot logic" (23631b9b) · Commits · e / os / android_system_core

fastboot/fastboot.cpp

+20 −21

Original line number	Original line	Diff line number	Diff line
	@@ -1600,10 +1600,10 @@ void FlashAllTool::Flash() {

	// Change the slot first, so we boot into the correct recovery image when		// Change the slot first, so we boot into the correct recovery image when
	// using fastbootd.		// using fastbootd.
	if (fp_->slot == "all") {		if (fp_->slot_override == "all") {
	set_active("a");		set_active("a");
	} else {		} else {
	set_active(fp_->slot);		set_active(fp_->slot_override);
	}		}

	DetermineSlot();		DetermineSlot();
	@@ -1654,17 +1654,17 @@ void FlashAllTool::CheckRequirements() {
	}		}

	void FlashAllTool::DetermineSlot() {		void FlashAllTool::DetermineSlot() {
	if (fp_->slot.empty()) {		if (fp_->slot_override.empty()) {
	fp_->current_slot = get_current_slot();		fp_->current_slot = get_current_slot();
	} else {		} else {
	fp_->current_slot = fp_->slot;		fp_->current_slot = fp_->slot_override;
	}		}

	if (fp_->skip_secondary) {		if (fp_->skip_secondary) {
	return;		return;
	}		}
	if (fp_->slot != "" && fp_->slot != "all") {		if (fp_->slot_override != "" && fp_->slot_override != "all") {
	fp_->secondary_slot = get_other_slot(fp_->slot);		fp_->secondary_slot = get_other_slot(fp_->slot_override);
	} else {		} else {
	fp_->secondary_slot = get_other_slot();		fp_->secondary_slot = get_other_slot();
	}		}
	@@ -1678,7 +1678,7 @@ void FlashAllTool::DetermineSlot() {

	void FlashAllTool::CollectImages() {		void FlashAllTool::CollectImages() {
	for (size_t i = 0; i < images.size(); ++i) {		for (size_t i = 0; i < images.size(); ++i) {
	std::string slot = fp_->slot;		std::string slot = fp_->slot_override;
	if (images[i].IsSecondary()) {		if (images[i].IsSecondary()) {
	if (fp_->skip_secondary) {		if (fp_->skip_secondary) {
	continue;		continue;
	@@ -2017,7 +2017,6 @@ int FastBootTool::Main(int argc, char* argv[]) {
	std::unique_ptr<FlashingPlan> fp = std::make_unique<FlashingPlan>();		std::unique_ptr<FlashingPlan> fp = std::make_unique<FlashingPlan>();

	int longindex;		int longindex;
	std::string slot_override;
	std::string next_active;		std::string next_active;

	g_boot_img_hdr.kernel_addr = 0x00008000;		g_boot_img_hdr.kernel_addr = 0x00008000;
	@@ -2090,7 +2089,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
	} else if (name == "skip-secondary") {		} else if (name == "skip-secondary") {
	fp->skip_secondary = true;		fp->skip_secondary = true;
	} else if (name == "slot") {		} else if (name == "slot") {
	slot_override = optarg;		fp->slot_override = optarg;
	} else if (name == "dtb-offset") {		} else if (name == "dtb-offset") {
	g_boot_img_hdr.dtb_addr = strtoul(optarg, 0, 16);		g_boot_img_hdr.dtb_addr = strtoul(optarg, 0, 16);
	} else if (name == "tags-offset") {		} else if (name == "tags-offset") {
	@@ -2182,12 +2181,12 @@ int FastBootTool::Main(int argc, char* argv[]) {

	const double start = now();		const double start = now();

	if (slot_override != "") slot_override = verify_slot(slot_override);		if (fp->slot_override != "") fp->slot_override = verify_slot(fp->slot_override);
	if (next_active != "") next_active = verify_slot(next_active, false);		if (next_active != "") next_active = verify_slot(next_active, false);

	if (fp->wants_set_active) {		if (fp->wants_set_active) {
	if (next_active == "") {		if (next_active == "") {
	if (slot_override == "") {		if (fp->slot_override == "") {
	std::string current_slot;		std::string current_slot;
	if (fb->GetVar("current-slot", &current_slot) == fastboot::SUCCESS) {		if (fb->GetVar("current-slot", &current_slot) == fastboot::SUCCESS) {
	if (current_slot[0] == '_') current_slot.erase(0, 1);		if (current_slot[0] == '_') current_slot.erase(0, 1);
	@@ -2196,7 +2195,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
	fp->wants_set_active = false;		fp->wants_set_active = false;
	}		}
	} else {		} else {
	next_active = verify_slot(slot_override, false);		next_active = verify_slot(fp->slot_override, false);
	}		}
	}		}
	}		}
	@@ -2221,7 +2220,7 @@ int FastBootTool::Main(int argc, char* argv[]) {

	fb->Erase(partition);		fb->Erase(partition);
	};		};
	do_for_partitions(partition, slot_override, erase, true);		do_for_partitions(partition, fp->slot_override, erase, true);
	} else if (android::base::StartsWith(command, "format")) {		} else if (android::base::StartsWith(command, "format")) {
	// Parsing for: "format[:[type][:[size]]]"		// Parsing for: "format[:[type][:[size]]]"
	// Some valid things:		// Some valid things:
	@@ -2241,7 +2240,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
	auto format = [&](const std::string& partition) {		auto format = [&](const std::string& partition) {
	fb_perform_format(partition, 0, type_override, size_override, fp->fs_options);		fb_perform_format(partition, 0, type_override, size_override, fp->fs_options);
	};		};
	do_for_partitions(partition, slot_override, format, true);		do_for_partitions(partition, fp->slot_override, format, true);
	} else if (command == "signature") {		} else if (command == "signature") {
	std::string filename = next_arg(&args);		std::string filename = next_arg(&args);
	std::vector<char> data;		std::vector<char> data;
	@@ -2286,7 +2285,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
	}		}
	if (fname.empty()) die("cannot determine image filename for '%s'", pname.c_str());		if (fname.empty()) die("cannot determine image filename for '%s'", pname.c_str());

	FlashTask task(slot_override, pname, fname, is_vbmeta_partition(pname));		FlashTask task(fp->slot_override, pname, fname, is_vbmeta_partition(pname));
	task.Run();		task.Run();
	} else if (command == "flash:raw") {		} else if (command == "flash:raw") {
	std::string partition = next_arg(&args);		std::string partition = next_arg(&args);
	@@ -2300,9 +2299,9 @@ int FastBootTool::Main(int argc, char* argv[]) {
	auto flashraw = [&data](const std::string& partition) {		auto flashraw = [&data](const std::string& partition) {
	fb->FlashPartition(partition, data);		fb->FlashPartition(partition, data);
	};		};
	do_for_partitions(partition, slot_override, flashraw, true);		do_for_partitions(partition, fp->slot_override, flashraw, true);
	} else if (command == "flashall") {		} else if (command == "flashall") {
	if (slot_override == "all") {		if (fp->slot_override == "all") {
	fprintf(stderr,		fprintf(stderr,
	"Warning: slot set to 'all'. Secondary slots will not be flashed.\n");		"Warning: slot set to 'all'. Secondary slots will not be flashed.\n");
	fp->skip_secondary = true;		fp->skip_secondary = true;
	@@ -2314,7 +2313,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
	reboot_task = std::make_unique<RebootTask>(fp.get());		reboot_task = std::make_unique<RebootTask>(fp.get());
	}		}
	} else if (command == "update") {		} else if (command == "update") {
	bool slot_all = (slot_override == "all");		bool slot_all = (fp->slot_override == "all");
	if (slot_all) {		if (slot_all) {
	fprintf(stderr,		fprintf(stderr,
	"Warning: slot set to 'all'. Secondary slots will not be flashed.\n");		"Warning: slot set to 'all'. Secondary slots will not be flashed.\n");
	@@ -2365,7 +2364,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
	std::string partition = next_arg(&args);		std::string partition = next_arg(&args);
	std::string size = next_arg(&args);		std::string size = next_arg(&args);
	std::unique_ptr<ResizeTask> resize_task =		std::unique_ptr<ResizeTask> resize_task =
	std::make_unique<ResizeTask>(fp.get(), partition, size, slot_override);		std::make_unique<ResizeTask>(fp.get(), partition, size, fp->slot_override);
	resize_task->Run();		resize_task->Run();
	} else if (command == "gsi") {		} else if (command == "gsi") {
	std::string arg = next_arg(&args);		std::string arg = next_arg(&args);
	@@ -2383,7 +2382,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
	} else {		} else {
	image = next_arg(&args);		image = next_arg(&args);
	}		}
	do_wipe_super(image, slot_override);		do_wipe_super(image, fp->slot_override);
	} else if (command == "snapshot-update") {		} else if (command == "snapshot-update") {
	std::string arg;		std::string arg;
	if (!args.empty()) {		if (!args.empty()) {
	@@ -2396,7 +2395,7 @@ int FastBootTool::Main(int argc, char* argv[]) {
	} else if (command == FB_CMD_FETCH) {		} else if (command == FB_CMD_FETCH) {
	std::string partition = next_arg(&args);		std::string partition = next_arg(&args);
	std::string outfile = next_arg(&args);		std::string outfile = next_arg(&args);
	do_fetch(partition, slot_override, outfile);		do_fetch(partition, fp->slot_override, outfile);
	} else {		} else {
	syntax_error("unknown command %s", command.c_str());		syntax_error("unknown command %s", command.c_str());
	}		}

fastboot/fastboot.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -80,7 +80,7 @@ struct FlashingPlan {
	bool skip_secondary = false;		bool skip_secondary = false;
	bool force_flash = false;		bool force_flash = false;

	std::string slot;		std::string slot_override;
	std::string current_slot;		std::string current_slot;
	std::string secondary_slot;		std::string secondary_slot;
	fastboot::FastBootDriver* fb;		fastboot::FastBootDriver* fb;

fastboot/task.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,7 @@ std::unique_ptr<FlashSuperLayoutTask> FlashSuperLayoutTask::Initialize(
	LOG(VERBOSE) << "Cannot optimize flashing super on non-AB device";		LOG(VERBOSE) << "Cannot optimize flashing super on non-AB device";
	return nullptr;		return nullptr;
	}		}
	if (fp->slot == "all") {		if (fp->slot_override == "all") {
	LOG(VERBOSE) << "Cannot optimize flashing super for all slots";		LOG(VERBOSE) << "Cannot optimize flashing super for all slots";
	return nullptr;		return nullptr;
	}		}