Merge "fastboot: Add "--slot other"" am: 6bb8f752ec (ba3e38f9) · Commits · e / os / android_system_core

fastboot/fastboot.cpp

+22 −5

Original line number	Diff line number	Diff line
		@@ -320,9 +320,10 @@ static void usage() {
		" device supports slots. This will be\n"
		" added to all partition names that use\n"
		" slots. 'all' can be given to refer\n"
		" to all slots. If this is not given,\n"
		" slotted partitions will default to\n"
		" the current active slot.\n"
		" to all slots. 'other' can be given to\n"
		" refer to a non-current slot. If this\n"
		" flag is not used, slotted partitions\n"
		" will default to the current active slot.\n"
		" -a, --set-active[=<suffix>] Sets the active slot. If no suffix is\n"
		" provided, this will default to the value\n"
		" given by --slot. If slots are not\n"
		@@ -797,12 +798,28 @@ static std::string verify_slot(Transport* transport, const char *slot, bool allo
		if (!suffixes.empty()) {
		return suffixes[0];
		} else {
		fprintf(stderr, "No known slots.\n");
		exit(1);
		die("No known slots.");
		}
		}
		}

		std::vector<std::string> suffixes = get_suffixes(transport);

		if (strcmp(slot, "other") == 0) {
		std::string current_slot;
		if (!fb_getvar(transport, "current-slot", &current_slot)) {
		die("Failed to identify current slot.");
		}
		if (!suffixes.empty()) {
		for (size_t i = 0; i < suffixes.size(); i++) {
		if (current_slot == suffixes[i])
		return suffixes[(i+1)%suffixes.size()];
		}
		} else {
		die("No known slots.");
		}
		}

		for (const std::string &suffix : suffixes) {
		if (suffix == slot)
		return slot;