commit 7a6558f283564bf0e4bc1238ad1fd58658d723c5
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 07 05:23:26 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 07 05:23:26 2021 +0000
tree 1dd51e1d8dd8f985600adde4d66ba616c20a5917
parent 8d1e3eb608e84b37aa48809bd707f09adb03bd07
parent 7ca3f35e20db033da7ae4aa22dea20e500e69ba1

Merge "Check property for sdcardfs usage" into android11-gsi

cmds/installd/utils.cpp

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";