summaryrefslogtreecommitdiffstats
path: root/recovery.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-06-06 03:41:22 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-06-06 03:41:22 +0200
commit3e72aaf11c00060241f2a59bbd4523600bf29a86 (patch)
tree440384897fa5143e97d5b266b9b7172450ddf5ae /recovery.cpp
parentMerge "Use ro.build.fingerprint instead of ro.bootimage.*" (diff)
parentMerge QQ3A.200605.002 into master (diff)
downloadandroid_bootable_recovery-3e72aaf11c00060241f2a59bbd4523600bf29a86.tar
android_bootable_recovery-3e72aaf11c00060241f2a59bbd4523600bf29a86.tar.gz
android_bootable_recovery-3e72aaf11c00060241f2a59bbd4523600bf29a86.tar.bz2
android_bootable_recovery-3e72aaf11c00060241f2a59bbd4523600bf29a86.tar.lz
android_bootable_recovery-3e72aaf11c00060241f2a59bbd4523600bf29a86.tar.xz
android_bootable_recovery-3e72aaf11c00060241f2a59bbd4523600bf29a86.tar.zst
android_bootable_recovery-3e72aaf11c00060241f2a59bbd4523600bf29a86.zip
Diffstat (limited to 'recovery.cpp')
-rw-r--r--recovery.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index e02bc726e..f41ac6acf 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(