Merge "fastboot: correct set_active behavior" am: 275d091441

am: f88b8cbe15

* commit 'f88b8cbe157b4372d4f1277e85ed25315ecd6c30':
  fastboot: correct set_active behavior
This commit is contained in:
Daniel Rosenberg 2016-01-06 19:49:25 +00:00 committed by android-build-merger
commit ed60d0706e

View file

@ -284,8 +284,6 @@ static void usage() {
" getvar <variable> Display a bootloader variable.\n"
" set_active <suffix> Sets the active slot. If slots are\n"
" not supported, this does nothing.\n"
" note: suffixes starting with a '-'\n"
" must use set_active -- <suffix>\n"
" boot <kernel> [ <ramdisk> [ <second> ] ] Download and boot kernel.\n"
" flash:raw boot <kernel> [ <ramdisk> [ <second> ] ]\n"
" Create bootimage and flash it.\n"
@ -1486,7 +1484,6 @@ int main(int argc, char **argv)
std::string slot = verify_slot(transport, argv[1], false);
fb_set_active(slot.c_str());
skip(2);
wants_reboot = true;
} else if(!strcmp(*argv, "oem")) {
argc = do_oem_command(argc, argv);
} else if(!strcmp(*argv, "flashing")) {