summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorxunchang <xunchang@google.com>2019-04-22 21:18:14 +0200
committerxunchang <xunchang@google.com>2019-04-26 19:36:48 +0200
commitfedeef6f6d1f7b8f1e5a8b9e77f8dc21ef6b3c95 (patch)
treefaef441afe34374f515635c59af444846c823354 /recovery.cpp
parentMerge "Parse BCB command to enter rescue mode." (diff)
downloadandroid_bootable_recovery-fedeef6f6d1f7b8f1e5a8b9e77f8dc21ef6b3c95.tar
android_bootable_recovery-fedeef6f6d1f7b8f1e5a8b9e77f8dc21ef6b3c95.tar.gz
android_bootable_recovery-fedeef6f6d1f7b8f1e5a8b9e77f8dc21ef6b3c95.tar.bz2
android_bootable_recovery-fedeef6f6d1f7b8f1e5a8b9e77f8dc21ef6b3c95.tar.lz
android_bootable_recovery-fedeef6f6d1f7b8f1e5a8b9e77f8dc21ef6b3c95.tar.xz
android_bootable_recovery-fedeef6f6d1f7b8f1e5a8b9e77f8dc21ef6b3c95.tar.zst
android_bootable_recovery-fedeef6f6d1f7b8f1e5a8b9e77f8dc21ef6b3c95.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/recovery.cpp b/recovery.cpp
index f9b3bfc0b..5fc673ec2 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -551,9 +551,9 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
if (chosen_action == Device::ENTER_RESCUE) {
// Switch to graphics screen.
ui->ShowText(false);
- status = ApplyFromAdb(ui, true /* rescue_mode */, &reboot_action);
+ status = ApplyFromAdb(device, true /* rescue_mode */, &reboot_action);
} else if (chosen_action == Device::APPLY_ADB_SIDELOAD) {
- status = ApplyFromAdb(ui, false /* rescue_mode */, &reboot_action);
+ status = ApplyFromAdb(device, false /* rescue_mode */, &reboot_action);
} else {
adb = false;
status = ApplyFromSdcard(device, ui);
@@ -946,7 +946,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
if (!sideload_auto_reboot) {
ui->ShowText(true);
}
- status = ApplyFromAdb(ui, false /* rescue_mode */, &next_action);
+ status = ApplyFromAdb(device, false /* rescue_mode */, &next_action);
ui->Print("\nInstall from ADB complete (status: %d).\n", status);
if (sideload_auto_reboot) {
status = INSTALL_REBOOT;
@@ -954,7 +954,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
}
} else if (rescue) {
save_current_log = true;
- status = ApplyFromAdb(ui, true /* rescue_mode */, &next_action);
+ status = ApplyFromAdb(device, true /* rescue_mode */, &next_action);
ui->Print("\nInstall from ADB complete (status: %d).\n", status);
} else if (fsck_unshare_blocks) {
if (!do_fsck_unshare_blocks()) {