From daaacea96ebfc55b47f44240e2082c820c8eb234 Mon Sep 17 00:00:00 2001
From: Raman Tenneti <rtenneti@google.com>
Date: Thu, 13 Feb 2020 02:50:42 +0000
Subject: Revert "Force package installation with FUSE unless the package
 stores on device"

This reverts commit 5e6c4e9a91674826bf11cab604250b41a9326fd8.

Reason for revert: BUG: 149432069 - build failure on git_qt-qpr1-dev-plus-aosp on docs. 'otautil/roots.h' file not found is the error.
Forrest run: https://android-build.googleplex.com/builds/forrest/run/L85900000460577420

Change-Id: I35119c2334895aa0ef4ed71b3ddd08f280c0c031
Merged-In: I35119c2334895aa0ef4ed71b3ddd08f280c0c031
---
 recovery.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'recovery.cpp')

diff --git a/recovery.cpp b/recovery.cpp
index 9747aae82..e4b8e45fb 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -687,11 +687,7 @@ Device::BuiltinAction start_recovery(Device* device, const std::vector<std::stri
         ensure_path_mounted(update_package);
       }
 
-      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) {
+      if (install_with_fuse) {
         LOG(INFO) << "Installing package " << update_package << " with fuse";
         status = InstallWithFuseFromPath(update_package, ui);
       } else if (auto memory_package = Package::CreateMemoryPackage(
-- 
cgit v1.2.3