diff options
| author | Bryan Ferris <bferris@google.com> | 2020-02-13 00:37:34 +0100 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-13 00:37:34 +0100 |
| commit | 7bc9c8297b44991a81a9c54ae19c1162ef7e5ffd (patch) | |
| tree | 056a7e38bdc99b99214183e2e58608612f6b2e72 /recovery.cpp | |
| parent | Merge "rm libbinderthreadstate" am: 2015fe5dbc am: ecfa97375f (diff) | |
| parent | Force package installation with FUSE unless the package stores on device (diff) | |
| download | android_bootable_recovery-7bc9c8297b44991a81a9c54ae19c1162ef7e5ffd.tar android_bootable_recovery-7bc9c8297b44991a81a9c54ae19c1162ef7e5ffd.tar.gz android_bootable_recovery-7bc9c8297b44991a81a9c54ae19c1162ef7e5ffd.tar.bz2 android_bootable_recovery-7bc9c8297b44991a81a9c54ae19c1162ef7e5ffd.tar.lz android_bootable_recovery-7bc9c8297b44991a81a9c54ae19c1162ef7e5ffd.tar.xz android_bootable_recovery-7bc9c8297b44991a81a9c54ae19c1162ef7e5ffd.tar.zst android_bootable_recovery-7bc9c8297b44991a81a9c54ae19c1162ef7e5ffd.zip | |
Diffstat (limited to 'recovery.cpp')
| -rw-r--r-- | recovery.cpp | 6 |
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( |