aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-09-29 19:11:13 -0500
committerTao Bao2017-10-02 13:18:13 -0500
commit3e18f2bf4004e9df2f7fcee0d2035552404ff715 (patch)
tree5419ae85b390213bbca80f905584c28dd4b2fd37 /install.cpp
parente8ee697364c1d123dccd3249a9f9e062e40a0fb4 (diff)
downloadplatform-bootable-recovery-3e18f2bf4004e9df2f7fcee0d2035552404ff715.tar.gz
platform-bootable-recovery-3e18f2bf4004e9df2f7fcee0d2035552404ff715.tar.xz
platform-bootable-recovery-3e18f2bf4004e9df2f7fcee0d2035552404ff715.zip
roots: Fix an issue with volume_for_path().
The earlier commit in 2dfc1a38982c4052bb32bc7fc06edeadf3908fb9 unintentionally changed the behavior. It gives a different result when looking up non-existent mount points (e.g. /cache on marlin). The logic behind volume_for_path("/xyz") is unclear: - It's fine to return non-null value if it's called by ensure_path_mounted() before accessing that file "/xyz". (Just based on the function name, we're not actually having this case.) - It should return nullptr if the caller is interested in the existence of that particular mount point "/xyz". This CL renames the function to volume_for_mount_point(), which does an exact match by querying the given mount point from libfs_mgr. The former volume_for_path() has been moved down to function scope for serving ensure_path_mounted() only. Test: Build and boot into recovery on bullhead and marlin respectively. 'View recovery logs'. Test: 'Mount /system' Test: 'Apply update from ADB' Change-Id: I1a16390f57540cae08a2b8f3d439d17886975217
Diffstat (limited to 'install.cpp')
-rw-r--r--install.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.cpp b/install.cpp
index 507161c2..74d1a68b 100644
--- a/install.cpp
+++ b/install.cpp
@@ -653,7 +653,7 @@ int install_package(const std::string& path, bool* wipe_cache, const std::string
653 std::chrono::duration<double> duration = std::chrono::system_clock::now() - start; 653 std::chrono::duration<double> duration = std::chrono::system_clock::now() - start;
654 int time_total = static_cast<int>(duration.count()); 654 int time_total = static_cast<int>(duration.count());
655 655
656 bool has_cache = volume_for_path("/cache") != nullptr; 656 bool has_cache = volume_for_mount_point("/cache") != nullptr;
657 // Skip logging the uncrypt_status on devices without /cache. 657 // Skip logging the uncrypt_status on devices without /cache.
658 if (has_cache) { 658 if (has_cache) {
659 static constexpr const char* UNCRYPT_STATUS = "/cache/recovery/uncrypt_status"; 659 static constexpr const char* UNCRYPT_STATUS = "/cache/recovery/uncrypt_status";