diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-04-29 20:06:22 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-29 20:06:22 +0200 |
| commit | 473532343c3a3fc2b3680167617891e61d9abc0c (patch) | |
| tree | 0ca7967a9341ef5aa58820c27f33a31647c31d8c /recovery.cpp | |
| parent | Merge "Add recovery_host_test to TEST_MAPPING." am: 42168c4ab2 (diff) | |
| parent | Merge "Support wipe command in rescue mode" (diff) | |
| download | android_bootable_recovery-473532343c3a3fc2b3680167617891e61d9abc0c.tar android_bootable_recovery-473532343c3a3fc2b3680167617891e61d9abc0c.tar.gz android_bootable_recovery-473532343c3a3fc2b3680167617891e61d9abc0c.tar.bz2 android_bootable_recovery-473532343c3a3fc2b3680167617891e61d9abc0c.tar.lz android_bootable_recovery-473532343c3a3fc2b3680167617891e61d9abc0c.tar.xz android_bootable_recovery-473532343c3a3fc2b3680167617891e61d9abc0c.tar.zst android_bootable_recovery-473532343c3a3fc2b3680167617891e61d9abc0c.zip | |
Diffstat (limited to '')
| -rw-r--r-- | recovery.cpp | 8 |
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()) { |