Merge "Force package installation with FUSE unless the package stores on device" into qt-qpr1-dev-plus-aosp

This commit is contained in:
Bryan Ferris
2020-02-12 23:37:34 +00:00
committed by Android (Google) Code Review
6 changed files with 87 additions and 1 deletions
+5 -1
View File
@@ -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(