diff options
author | Tao Bao <tbao@google.com> | 2017-05-01 22:52:11 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-01 22:52:11 +0200 |
commit | dc534a9481462ca74d55509d7942aa8c820aa018 (patch) | |
tree | 09473679028a2f8a4f3bfff63da9bf05ed8eac88 /recovery.cpp | |
parent | Merge "minui: Fix breakage in graphics_adf." (diff) | |
parent | Merge "adb_install: Stop passing RecoveryUI as a parameter." (diff) | |
download | android_bootable_recovery-dc534a9481462ca74d55509d7942aa8c820aa018.tar android_bootable_recovery-dc534a9481462ca74d55509d7942aa8c820aa018.tar.gz android_bootable_recovery-dc534a9481462ca74d55509d7942aa8c820aa018.tar.bz2 android_bootable_recovery-dc534a9481462ca74d55509d7942aa8c820aa018.tar.lz android_bootable_recovery-dc534a9481462ca74d55509d7942aa8c820aa018.tar.xz android_bootable_recovery-dc534a9481462ca74d55509d7942aa8c820aa018.tar.zst android_bootable_recovery-dc534a9481462ca74d55509d7942aa8c820aa018.zip |
Diffstat (limited to '')
-rw-r--r-- | recovery.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recovery.cpp b/recovery.cpp index 3041d6cac..944c24086 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1155,7 +1155,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) { { bool adb = (chosen_action == Device::APPLY_ADB_SIDELOAD); if (adb) { - status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE); + status = apply_from_adb(&should_wipe_cache, TEMPORARY_INSTALL_FILE); } else { status = apply_from_sdcard(device, &should_wipe_cache); } @@ -1584,7 +1584,7 @@ int main(int argc, char **argv) { if (!sideload_auto_reboot) { ui->ShowText(true); } - status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE); + status = apply_from_adb(&should_wipe_cache, TEMPORARY_INSTALL_FILE); if (status == INSTALL_SUCCESS && should_wipe_cache) { if (!wipe_cache(false, device)) { status = INSTALL_ERROR; |