aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-05-01 13:31:28 -0500
committerTao Bao2017-05-01 13:47:43 -0500
commit0150d013eb096a85e541294ee9df320ef4227df0 (patch)
tree09473679028a2f8a4f3bfff63da9bf05ed8eac88 /recovery.cpp
parent54da1122776f38ae365f61bb0ea190b456b2fa62 (diff)
downloadplatform-bootable-recovery-0150d013eb096a85e541294ee9df320ef4227df0.tar.gz
platform-bootable-recovery-0150d013eb096a85e541294ee9df320ef4227df0.tar.xz
platform-bootable-recovery-0150d013eb096a85e541294ee9df320ef4227df0.zip
adb_install: Stop passing RecoveryUI as a parameter.
It's already a global declared in common.h which is included by adb_install.cpp. Remove '#include "minadbd/fuse_adb_provider.h"' that's not needed by adb_install.cpp (minadbd takes care of that). Test: mmma bootable/recovery Change-Id: I6d08b7abc706b4b05de2ef46a57ced2204ad297e
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 3041d6ca..944c2408 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1155,7 +1155,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
1155 { 1155 {
1156 bool adb = (chosen_action == Device::APPLY_ADB_SIDELOAD); 1156 bool adb = (chosen_action == Device::APPLY_ADB_SIDELOAD);
1157 if (adb) { 1157 if (adb) {
1158 status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE); 1158 status = apply_from_adb(&should_wipe_cache, TEMPORARY_INSTALL_FILE);
1159 } else { 1159 } else {
1160 status = apply_from_sdcard(device, &should_wipe_cache); 1160 status = apply_from_sdcard(device, &should_wipe_cache);
1161 } 1161 }
@@ -1584,7 +1584,7 @@ int main(int argc, char **argv) {
1584 if (!sideload_auto_reboot) { 1584 if (!sideload_auto_reboot) {
1585 ui->ShowText(true); 1585 ui->ShowText(true);
1586 } 1586 }
1587 status = apply_from_adb(ui, &should_wipe_cache, TEMPORARY_INSTALL_FILE); 1587 status = apply_from_adb(&should_wipe_cache, TEMPORARY_INSTALL_FILE);
1588 if (status == INSTALL_SUCCESS && should_wipe_cache) { 1588 if (status == INSTALL_SUCCESS && should_wipe_cache) {
1589 if (!wipe_cache(false, device)) { 1589 if (!wipe_cache(false, device)) {
1590 status = INSTALL_ERROR; 1590 status = INSTALL_ERROR;