summaryrefslogtreecommitdiffstats
path: root/minadbd
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-07-09 03:07:22 +0200
committerTao Bao <tbao@google.com>2019-07-11 07:32:51 +0200
commit0bbb2ed53eb4dc4ae8d447062482f9eda5ef9a91 (patch)
tree44590befa6ee02ce366046baa4b890cf43f9b57b /minadbd
parentRevert "libprocessgroup users use libcutils" (diff)
downloadandroid_bootable_recovery-0bbb2ed53eb4dc4ae8d447062482f9eda5ef9a91.tar
android_bootable_recovery-0bbb2ed53eb4dc4ae8d447062482f9eda5ef9a91.tar.gz
android_bootable_recovery-0bbb2ed53eb4dc4ae8d447062482f9eda5ef9a91.tar.bz2
android_bootable_recovery-0bbb2ed53eb4dc4ae8d447062482f9eda5ef9a91.tar.lz
android_bootable_recovery-0bbb2ed53eb4dc4ae8d447062482f9eda5ef9a91.tar.xz
android_bootable_recovery-0bbb2ed53eb4dc4ae8d447062482f9eda5ef9a91.tar.zst
android_bootable_recovery-0bbb2ed53eb4dc4ae8d447062482f9eda5ef9a91.zip
Diffstat (limited to 'minadbd')
-rw-r--r--minadbd/minadbd_services.cpp8
-rw-r--r--minadbd/minadbd_types.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index 68f940cd8..03341e4b8 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -190,6 +190,14 @@ static void RescueGetpropHostService(unique_fd sfd, const std::string& prop) {
if (!android::base::WriteFully(sfd, result.data(), result.size())) {
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
diff --git a/minadbd/minadbd_types.h b/minadbd/minadbd_types.h
index 99fd45e83..002523f1f 100644
--- a/minadbd/minadbd_types.h
+++ b/minadbd/minadbd_types.h
@@ -53,6 +53,7 @@ enum class MinadbdCommand : uint32_t {
kRebootRescue = 6,
kWipeCache = 7,
kWipeData = 8,
+ kNoOp = 9,
// Last but invalid command.
kError,