summaryrefslogtreecommitdiffstats
path: root/install/adb_install.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2019-07-10 23:09:58 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-07-10 23:09:58 +0200
commitbf574061106ebb3a0f2e8b2bba90a4f2ea0b3a8c (patch)
tree6cce97f4c06f7f984a2ec20a920ca097ae60114d /install/adb_install.cpp
parentMerge "Add a new key_pressed_mutex" am: 33bb113af2 (diff)
parentMerge "minadbd sends heartbeat to rescue service for getprop command." (diff)
downloadandroid_bootable_recovery-bf574061106ebb3a0f2e8b2bba90a4f2ea0b3a8c.tar
android_bootable_recovery-bf574061106ebb3a0f2e8b2bba90a4f2ea0b3a8c.tar.gz
android_bootable_recovery-bf574061106ebb3a0f2e8b2bba90a4f2ea0b3a8c.tar.bz2
android_bootable_recovery-bf574061106ebb3a0f2e8b2bba90a4f2ea0b3a8c.tar.lz
android_bootable_recovery-bf574061106ebb3a0f2e8b2bba90a4f2ea0b3a8c.tar.xz
android_bootable_recovery-bf574061106ebb3a0f2e8b2bba90a4f2ea0b3a8c.tar.zst
android_bootable_recovery-bf574061106ebb3a0f2e8b2bba90a4f2ea0b3a8c.zip
Diffstat (limited to 'install/adb_install.cpp')
-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 37280a34c..ed664429a 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);