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

Commit 2223e6a9 authored Jul 08, 2019 by Tao Bao

minadbd sends heartbeat to rescue service for getprop command.

We start minadbd and rescue services in two processes. In particular,
minadbd handles the requests from host, then communicates with rescue
service to do install/wipe works. When resuce service doesn't see any
request in a pre-defined timeout (currently 300s), rescue service will
exit to avoid endless waiting.

This CL changes minadbd to additionally send a no-op command to rescue
service as a heartbeat signal, so that host side can finish
time-consuming operations (e.g. downloading over network) while keeping
rescue service alive.

Bug: 136457446
Test: Enter resuce mode on blueline. Send `adb rescue getprop
      ro.build.fingerprint` and check that rescue service doesn't exit.
Test: Stop sending the getprop command. Check that rescue service exits
      after 300s.
Change-Id: Ib9d5ed710cfa94ecfe6cf393a71a0b67b2539531

parent 5135d1f0

install/adb_install.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -367,11 +367,13 @@ InstallResult ApplyFromAdb(Device* device, bool rescue_mode, Device::BuiltinActi
	"\n\nNow send the package you want to apply\n"		"\n\nNow send the package you want to apply\n"
	"to the device with \"adb sideload <filename>\"...\n");		"to the device with \"adb sideload <filename>\"...\n");
	} else {		} else {
	ui->Print("\n\nWaiting for rescue commands...\n");
	command_map.emplace(MinadbdCommand::kWipeData, [&device]() {		command_map.emplace(MinadbdCommand::kWipeData, [&device]() {
	bool result = WipeData(device, false);		bool result = WipeData(device, false);
	return std::make_pair(result, true);		return std::make_pair(result, true);
	});		});
			command_map.emplace(MinadbdCommand::kNoOp, []() { return std::make_pair(true, true); });

			ui->Print("\n\nWaiting for rescue commands...\n");
	}		}

	CreateMinadbdServiceAndExecuteCommands(ui, command_map, rescue_mode);		CreateMinadbdServiceAndExecuteCommands(ui, command_map, rescue_mode);

minadbd/minadbd_services.cpp

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -190,6 +190,14 @@ static void RescueGetpropHostService(unique_fd sfd, const std::string& prop) {
	if (!android::base::WriteFully(sfd, result.data(), result.size())) {		if (!android::base::WriteFully(sfd, result.data(), result.size())) {
	exit(kMinadbdHostSocketIOError);		exit(kMinadbdHostSocketIOError);
	}		}

			// Send heartbeat signal to keep the rescue service alive.
			if (!WriteCommandToFd(MinadbdCommand::kNoOp, minadbd_socket)) {
			exit(kMinadbdSocketIOError);
			}
			if (MinadbdCommandStatus status; !WaitForCommandStatus(minadbd_socket, &status)) {
			exit(kMinadbdMessageFormatError);
			}
	}		}

	// Reboots into the given target. We don't reboot directly from minadbd, but going through recovery		// Reboots into the given target. We don't reboot directly from minadbd, but going through recovery

minadbd/minadbd_types.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,7 @@ enum class MinadbdCommand : uint32_t {
	kRebootRescue = 6,		kRebootRescue = 6,
	kWipeCache = 7,		kWipeCache = 7,
	kWipeData = 8,		kWipeData = 8,
			kNoOp = 9,

	// Last but invalid command.		// Last but invalid command.
	kError,		kError,