diff options
| author | Tao Bao <tbao@google.com> | 2019-07-10 21:52:44 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-10 21:52:44 +0200 |
| commit | 89cc79cbb6580dec18ffe520856a474a46456f1a (patch) | |
| tree | aa3ccceb4e33d60bcaa19d250dca10cc837eff13 /minadbd | |
| parent | Merge "Add a new key_pressed_mutex" (diff) | |
| parent | minadbd sends heartbeat to rescue service for getprop command. (diff) | |
| download | android_bootable_recovery-89cc79cbb6580dec18ffe520856a474a46456f1a.tar android_bootable_recovery-89cc79cbb6580dec18ffe520856a474a46456f1a.tar.gz android_bootable_recovery-89cc79cbb6580dec18ffe520856a474a46456f1a.tar.bz2 android_bootable_recovery-89cc79cbb6580dec18ffe520856a474a46456f1a.tar.lz android_bootable_recovery-89cc79cbb6580dec18ffe520856a474a46456f1a.tar.xz android_bootable_recovery-89cc79cbb6580dec18ffe520856a474a46456f1a.tar.zst android_bootable_recovery-89cc79cbb6580dec18ffe520856a474a46456f1a.zip | |
Diffstat (limited to 'minadbd')
| -rw-r--r-- | minadbd/minadbd_services.cpp | 8 | ||||
| -rw-r--r-- | minadbd/minadbd_types.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp index 5792c7a17..c31afbe06 100644 --- a/minadbd/minadbd_services.cpp +++ b/minadbd/minadbd_services.cpp @@ -189,6 +189,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, |