diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-16 07:53:28 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-02-16 07:53:28 +0100 |
commit | 266a01b79989ede69d9412991ddde00448e87318 (patch) | |
tree | 30f79316659123994c70a497febba468e862b4ae /recovery.cpp | |
parent | Merge "Enable different interface for fastboot for cf" (diff) | |
parent | Perform data wipe in recovery if ota package has powerwash set (diff) | |
download | android_bootable_recovery-266a01b79989ede69d9412991ddde00448e87318.tar android_bootable_recovery-266a01b79989ede69d9412991ddde00448e87318.tar.gz android_bootable_recovery-266a01b79989ede69d9412991ddde00448e87318.tar.bz2 android_bootable_recovery-266a01b79989ede69d9412991ddde00448e87318.tar.lz android_bootable_recovery-266a01b79989ede69d9412991ddde00448e87318.tar.xz android_bootable_recovery-266a01b79989ede69d9412991ddde00448e87318.tar.zst android_bootable_recovery-266a01b79989ede69d9412991ddde00448e87318.zip |
Diffstat (limited to '')
-rw-r--r-- | recovery.cpp | 6 |
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"); |