Merge "Fix the input parameter for "set_retry_bootloader_message"" (0e60ccdc) · Commits · e / tools / etwrp

recovery.cpp

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1304,11 +1304,11 @@ static bool is_battery_ok() {
	}		}
	}		}

	static void set_retry_bootloader_message(int retry_count, int argc, char** argv) {		static void set_retry_bootloader_message(int retry_count, const std::vector<std::string>& args) {
	std::vector<std::string> options;		std::vector<std::string> options;
	for (int i = 1; i < argc; ++i) {		for (const auto& arg : args) {
	if (strstr(argv[i], "retry_count") == nullptr) {		if (!android::base::StartsWith(arg, "--retry_count")) {
	options.push_back(argv[i]);		options.push_back(arg);
	}		}
	}		}

	@@ -1534,7 +1534,7 @@ int main(int argc, char **argv) {
	// times before we abandon this OTA update.		// times before we abandon this OTA update.
	if (status == INSTALL_RETRY && retry_count < EIO_RETRY_COUNT) {		if (status == INSTALL_RETRY && retry_count < EIO_RETRY_COUNT) {
	copy_logs();		copy_logs();
	set_retry_bootloader_message(retry_count, argc, argv);		set_retry_bootloader_message(retry_count, args);
	// Print retry count on screen.		// Print retry count on screen.
	ui->Print("Retry attempt %d\n", retry_count);		ui->Print("Retry attempt %d\n", retry_count);