commit f570ded508aacc8130a2fd8f1130a51991202d9d
author Jeff Sharkey <jsharkey@android.com> Wed Dec 16 22:19:11 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 16 22:19:11 2015 +0000
tree d2b3b432588135c7982c47234590b73f3a5ec43b
parent a9d5080109623884c8f8e7c3515eaa9ed3f85c58
parent e0074f142b4c9b6bfc750abbcb4ee0786676d0df

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

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())) {