Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed60d070 authored by Daniel Rosenberg's avatar Daniel Rosenberg Committed by android-build-merger
Browse files

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

am: f88b8cbe

* commit 'f88b8cbe':
  fastboot: correct set_active behavior
parents 4c4c8a86 f88b8cbe

fastboot/fastboot.cpp

+0 −3
Original line number Diff line number Diff line
@@ -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")) {