summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-08-06 21:32:05 +0200
committerBryan Ferris <bferris@google.com>2020-02-13 20:16:38 +0100
commitcd8faf7eeead6fd6ee5912ddd26dab5ab6c7dda7 (patch)
tree514f930addae708edfb05b471e8d60933c1d0d52 /recovery.cpp
parentMerge "Revert "Force package installation with FUSE unless the package stores on device"" into qt-qpr1-dev-plus-aosp (diff)
downloadandroid_bootable_recovery-cd8faf7eeead6fd6ee5912ddd26dab5ab6c7dda7.tar
android_bootable_recovery-cd8faf7eeead6fd6ee5912ddd26dab5ab6c7dda7.tar.gz
android_bootable_recovery-cd8faf7eeead6fd6ee5912ddd26dab5ab6c7dda7.tar.bz2
android_bootable_recovery-cd8faf7eeead6fd6ee5912ddd26dab5ab6c7dda7.tar.lz
android_bootable_recovery-cd8faf7eeead6fd6ee5912ddd26dab5ab6c7dda7.tar.xz
android_bootable_recovery-cd8faf7eeead6fd6ee5912ddd26dab5ab6c7dda7.tar.zst
android_bootable_recovery-cd8faf7eeead6fd6ee5912ddd26dab5ab6c7dda7.zip
Diffstat (limited to '')
-rw-r--r--recovery.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 9ea616e13..526e1a556 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -752,7 +752,11 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
ensure_path_mounted(update_package);
}
- if (install_with_fuse) {
+ bool should_use_fuse = false;
+ if (!SetupPackageMount(update_package, &should_use_fuse)) {
+ LOG(INFO) << "Failed to set up the package access, skipping installation";
+ status = INSTALL_ERROR;
+ } else if (install_with_fuse || should_use_fuse) {
LOG(INFO) << "Installing package " << update_package << " with fuse";
status = InstallWithFuseFromPath(update_package, ui);
} else if (auto memory_package = Package::CreateMemoryPackage(