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

Commit 8eb1e5ad authored by Chun-Wei Wang's avatar Chun-Wei Wang Committed by Automerger Merge Worker
Browse files

Merge "Add a fastboot command to show GSI status" into main am: 62051237 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2735077



Change-Id: I4174c0ccc2e5fcb308959458b2ed63a979017aef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1598c5f4 62051237

fastboot/device/commands.cpp

+11 −0
Original line number Diff line number Diff line
@@ -661,6 +661,17 @@ bool GsiHandler(FastbootDevice* device, const std::vector<std::string>& args) { 
        if (!android::gsi::DisableGsi()) {

            return device->WriteStatus(FastbootResult::FAIL, strerror(errno));

        }

    } else if (args[1] == "status") {

        std::string active_dsu;

        if (!android::gsi::IsGsiRunning()) {

            device->WriteInfo("Not running");

        } else if (!android::gsi::GetActiveDsu(&active_dsu)) {

            return device->WriteFail(strerror(errno));

        } else {

            device->WriteInfo("Running active DSU: " + active_dsu);

        }

    } else {

        return device->WriteFail("Invalid arguments");

    }

    return device->WriteStatus(FastbootResult::OKAY, "Success");

}

fastboot/fastboot.cpp

+5 −7
Original line number Diff line number Diff line
@@ -2573,14 +2573,12 @@ int FastBootTool::Main(int argc, char* argv[]) { 
                    std::make_unique<ResizeTask>(fp.get(), partition, size, fp->slot_override);

            resize_task->Run();

        } else if (command == "gsi") {

            std::string arg = next_arg(&args);

            if (arg == "wipe") {

                fb->RawCommand("gsi:wipe", "wiping GSI");

            } else if (arg == "disable") {

                fb->RawCommand("gsi:disable", "disabling GSI");

            } else {

                syntax_error("expected 'wipe' or 'disable'");

            if (args.empty()) syntax_error("invalid gsi command");

            std::string cmd("gsi");

            while (!args.empty()) {

                cmd += ":" + next_arg(&args);

            }

            fb->RawCommand(cmd, "");

        } else if (command == "wipe-super") {

            std::string image;

            if (args.empty()) {