aboutsummaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-07-10 19:52:44 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-07-10 19:52:44 +0000
commit89cc79cbb6580dec18ffe520856a474a46456f1a (patch)
treeaa3ccceb4e33d60bcaa19d250dca10cc837eff13 /install
parent33bb113af21edd00d15bbdf843c9cffe2d96ac90 (diff)
parent2223e6a9f8bf24b023e8ae3103b50c37def3147e (diff)
Merge "minadbd sends heartbeat to rescue service for getprop command."
Diffstat (limited to 'install')
-rw-r--r--install/adb_install.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/install/adb_install.cpp b/install/adb_install.cpp
index 37280a34..ed664429 100644
--- a/install/adb_install.cpp
+++ b/install/adb_install.cpp
@@ -367,11 +367,13 @@ InstallResult ApplyFromAdb(Device* device, bool rescue_mode, Device::BuiltinActi
"\n\nNow send the package you want to apply\n"
"to the device with \"adb sideload <filename>\"...\n");
} else {
- ui->Print("\n\nWaiting for rescue commands...\n");
command_map.emplace(MinadbdCommand::kWipeData, [&device]() {
bool result = WipeData(device, false);
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);