PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Force package installation with FUSE unless the package stores on device"

Browse Source 
This reverts commit 5e6c4e9a91.

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
This commit is contained in:
Raman Tenneti
2020-02-13 03:03:36 +00:00
parent 5e6c4e9a91
commit daaacea96e
6 changed files with 1 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/install.cpp
-47
View File
@@ -30,7 +30,6 @@
#include <atomic>
#include <chrono>
#include <condition_variable>
#include <filesystem>
#include <functional>
#include <limits>
#include <mutex>
@@ -642,49 +641,3 @@ bool verify_package(Package* package, RecoveryUI* ui) {
}
return true;
}
bool SetupPackageMount(const std::string& package_path, bool* should_use_fuse) {
CHECK(should_use_fuse != nullptr);
if (package_path.empty()) {
return false;
}
*should_use_fuse = true;
if (package_path[0] == '@') {
auto block_map_path = package_path.substr(1);
if (ensure_path_mounted(block_map_path) != 0) {
LOG(ERROR) << "Failed to mount " << block_map_path;
return false;
}
// uncrypt only produces block map only if the package stays on /data.
*should_use_fuse = false;
return true;
}
// Package is not a block map file.
if (ensure_path_mounted(package_path) != 0) {
LOG(ERROR) << "Failed to mount " << package_path;
return false;
}
// Reject the package if the input path doesn't equal the canonicalized path.
// e.g. /cache/../sdcard/update_package.
std::error_code ec;
auto canonical_path = std::filesystem::canonical(package_path, ec);
if (ec) {
LOG(ERROR) << "Failed to get canonical of " << package_path << ", " << ec.message();
return false;
}
if (canonical_path.string() != package_path) {
LOG(ERROR) << "Installation aborts. The canonical path " << canonical_path.string()
<< " doesn't equal the original path " << package_path;
return false;
}
constexpr const char* CACHE_ROOT = "/cache";
if (android::base::StartsWith(package_path, CACHE_ROOT)) {
*should_use_fuse = false;
}
return true;
}