summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-05-01 23:00:14 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-01 23:00:14 +0200
commit84cec1e00315aa604ffe682f6744c2f16cc5c4c0 (patch)
tree1c5d83ef372f6af4d321d5c56394212e3ca86a0a /recovery.cpp
parentMerge "minui: Fix breakage in graphics_adf." am: 54da112277 am: d66f05b82c am: 4cc6889da8 (diff)
parentMerge "adb_install: Stop passing RecoveryUI as a parameter." am: e58dabade9 am: dc534a9481 (diff)
downloadandroid_bootable_recovery-84cec1e00315aa604ffe682f6744c2f16cc5c4c0.tar
android_bootable_recovery-84cec1e00315aa604ffe682f6744c2f16cc5c4c0.tar.gz
android_bootable_recovery-84cec1e00315aa604ffe682f6744c2f16cc5c4c0.tar.bz2
android_bootable_recovery-84cec1e00315aa604ffe682f6744c2f16cc5c4c0.tar.lz
android_bootable_recovery-84cec1e00315aa604ffe682f6744c2f16cc5c4c0.tar.xz
android_bootable_recovery-84cec1e00315aa604ffe682f6744c2f16cc5c4c0.tar.zst
android_bootable_recovery-84cec1e00315aa604ffe682f6744c2f16cc5c4c0.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp4
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;