ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Chun-Wei Wang 2023-09-05 22:18:40 +00:00 • committed by Gerrit Code Review
commit 62051237a2
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fastboot/device/commands.cpp
View file

@ -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");
}

12
fastboot/fastboot.cpp
View file

@ -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()) {