commit e0074f142b4c9b6bfc750abbcb4ee0786676d0df
author Qin Chao <chao.qin@intel.com> Tue Dec 15 15:20:41 2015 +0800
committer Qin Chao <chao.qin@intel.com> Tue Dec 15 15:20:41 2015 +0800
tree d2b3b432588135c7982c47234590b73f3a5ec43b
parent a9d5080109623884c8f8e7c3515eaa9ed3f85c58

Hide external storage from apps if it's not set as adoptable

If storage is not visible to apps and no need to spin up FUSE, it also
should not make FUSE mount point directory.

Change-Id: I6ecd2e5bf56b5dcf0e11834880256b156a62a9a0
Signed-off-by: Qin Chao <chao.qin@intel.com>

PublicVolume.cpp

diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index 2ec6736..8580da9 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -123,10 +123,7 @@
         setPath(mRawPath);
     }
 
-    if (fs_prepare_dir(mRawPath.c_str(), 0700, AID_ROOT, AID_ROOT) ||
-            fs_prepare_dir(mFuseDefault.c_str(), 0700, AID_ROOT, AID_ROOT) ||
-            fs_prepare_dir(mFuseRead.c_str(), 0700, AID_ROOT, AID_ROOT) ||
-            fs_prepare_dir(mFuseWrite.c_str(), 0700, AID_ROOT, AID_ROOT)) {
+    if (fs_prepare_dir(mRawPath.c_str(), 0700, AID_ROOT, AID_ROOT)) {
         PLOG(ERROR) << getId() << " failed to create mount points";
         return -errno;
     }
@@ -146,6 +143,13 @@
         return OK;
     }
 
+    if (fs_prepare_dir(mFuseDefault.c_str(), 0700, AID_ROOT, AID_ROOT) ||
+            fs_prepare_dir(mFuseRead.c_str(), 0700, AID_ROOT, AID_ROOT) ||
+            fs_prepare_dir(mFuseWrite.c_str(), 0700, AID_ROOT, AID_ROOT)) {
+        PLOG(ERROR) << getId() << " failed to create FUSE mount points";
+        return -errno;
+    }
+
     dev_t before = GetDevice(mFuseWrite);
 
     if (!(mFusePid = fork())) {