resolved conflicts for merge of de28adf3 to mnc-dev-plus-aosp (5b3ca7b1) · Commits · e / os / android_system_core

fastboot/fastboot.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -724,13 +724,14 @@ void do_update(usb_handle usb, const char filename, int erase_first)

		setup_requirements(reinterpret_cast<char*>(data), sz);

		for (size_t i = 0; i < ARRAY_SIZE(images); i++) {
		for (size_t i = 0; i < ARRAY_SIZE(images); ++i) {
		int fd = unzip_to_file(zip, images[i].img_name);
		if (fd < 0) {
		if (images[i].is_optional)
		if (fd == -1) {
		if (images[i].is_optional) {
		continue;
		}
		CloseArchive(zip);
		die("update package missing %s", images[i].img_name);
		exit(1); // unzip_to_file already explained why.
		}
		fastboot_buffer buf;
		int rc = load_buf_fd(usb, fd, &buf);