summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-02-16 09:00:08 +0100
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-16 09:00:08 +0100
commitc063deca1488c9271a79910eeabc317150d7a0e2 (patch)
tree07c9a404d116c8b85dc820126296629779e82d4b /recovery.cpp
parentMerge "Enable different interface for fastboot for cf" am: 46a3704702 am: 65700df1fe am: 4aed1b7059 (diff)
parentMerge "Perform data wipe in recovery if ota package has powerwash set" am: 266a01b799 am: 01f1e6cd40 (diff)
downloadandroid_bootable_recovery-c063deca1488c9271a79910eeabc317150d7a0e2.tar
android_bootable_recovery-c063deca1488c9271a79910eeabc317150d7a0e2.tar.gz
android_bootable_recovery-c063deca1488c9271a79910eeabc317150d7a0e2.tar.bz2
android_bootable_recovery-c063deca1488c9271a79910eeabc317150d7a0e2.tar.lz
android_bootable_recovery-c063deca1488c9271a79910eeabc317150d7a0e2.tar.xz
android_bootable_recovery-c063deca1488c9271a79910eeabc317150d7a0e2.tar.zst
android_bootable_recovery-c063deca1488c9271a79910eeabc317150d7a0e2.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 641fe4788..0c977c361 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -752,20 +752,20 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
status = INSTALL_ERROR;
} else if (install_with_fuse || should_use_fuse) {
LOG(INFO) << "Installing package " << update_package << " with fuse";
- status = InstallWithFuseFromPath(update_package, ui);
+ status = InstallWithFuseFromPath(update_package, device);
} else if (auto memory_package = Package::CreateMemoryPackage(
update_package,
std::bind(&RecoveryUI::SetProgress, ui, std::placeholders::_1));
memory_package != nullptr) {
status = InstallPackage(memory_package.get(), update_package, should_wipe_cache,
- retry_count, ui);
+ retry_count, device);
} else {
// We may fail to memory map the package on 32 bit builds for packages with 2GiB+ size.
// In such cases, we will try to install the package with fuse. This is not the default
// installation method because it introduces a layer of indirection from the kernel space.
LOG(WARNING) << "Failed to memory map package " << update_package
<< "; falling back to install with fuse";
- status = InstallWithFuseFromPath(update_package, ui);
+ status = InstallWithFuseFromPath(update_package, device);
}
if (status != INSTALL_SUCCESS) {
ui->Print("Installation aborted.\n");