Check property for sdcardfs usage
We should check for external_storage.sdcardfs.enabled before deciding
that the system is using sdcardfs.
Test: Run on device not using sdcardfs, but with sdcardfs present in
kernel
Bug: 160727529
Bug: 181819712
Change-Id: I399348ddd01349fe6c2d5e8365f52eedb9752c90
diff --git a/cmds/installd/utils.cpp b/cmds/installd/utils.cpp
index c47df52..c4ecd07 100644
--- a/cmds/installd/utils.cpp
+++ b/cmds/installd/utils.cpp
@@ -1062,6 +1062,8 @@
static const char* kProcFilesystems = "/proc/filesystems";
bool supports_sdcardfs() {
+ if (!property_get_bool("external_storage.sdcardfs.enabled", true))
+ return false;
std::string supported;
if (!android::base::ReadFileToString(kProcFilesystems, &supported)) {
PLOG(ERROR) << "Failed to read supported filesystems";