diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-06-14 04:34:47 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-14 04:34:47 +0200 |
| commit | f7498516cae7ea7c1e6c907666c281ed1f015e90 (patch) | |
| tree | a140b3170452f8d029d38f3dfa57aedc704759b6 /recovery.cpp | |
| parent | Merge "Use the new ziparchive Next std::string_view overload." am: 053ea111a7 (diff) | |
| parent | Merge "InstallPackage now takes a package as parameter" (diff) | |
| download | android_bootable_recovery-f7498516cae7ea7c1e6c907666c281ed1f015e90.tar android_bootable_recovery-f7498516cae7ea7c1e6c907666c281ed1f015e90.tar.gz android_bootable_recovery-f7498516cae7ea7c1e6c907666c281ed1f015e90.tar.bz2 android_bootable_recovery-f7498516cae7ea7c1e6c907666c281ed1f015e90.tar.lz android_bootable_recovery-f7498516cae7ea7c1e6c907666c281ed1f015e90.tar.xz android_bootable_recovery-f7498516cae7ea7c1e6c907666c281ed1f015e90.tar.zst android_bootable_recovery-f7498516cae7ea7c1e6c907666c281ed1f015e90.zip | |
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp index eb0c2b216..db66ea7e9 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -732,7 +732,15 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri set_retry_bootloader_message(retry_count + 1, args); } - status = InstallPackage(update_package, should_wipe_cache, true, retry_count, ui); + if (update_package[0] == '@') { + ensure_path_mounted(update_package + 1); + } else { + ensure_path_mounted(update_package); + } + // TODO(xunchang) install package from fuse for large packages on ILP32 builds. + auto package = Package::CreateMemoryPackage( + update_package, std::bind(&RecoveryUI::SetProgress, ui, std::placeholders::_1)); + status = InstallPackage(package.get(), update_package, should_wipe_cache, retry_count, ui); if (status != INSTALL_SUCCESS) { ui->Print("Installation aborted.\n"); |