commit 8d15cb9828f89709243b33c610b429694788c05d
author Jeff Sharkey <jsharkey@android.com> Wed May 13 12:36:48 2015 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed May 13 12:36:48 2015 -0700
tree 33b6d5127337ae65abf3bf2b8748bb08d68f3585
parent 74e6349d8e4dde988c121e9674472908cc8c748d

Report internal path for public volumes.

Used by framework to bypass FUSE daemon overhead in some cases.

Bug: 21017105
Change-Id: I2f3ae70607417fc4cd2c970cb17cf3afa2f42613

EmulatedVolume.cpp

diff --git a/EmulatedVolume.cpp b/EmulatedVolume.cpp
index 7098872..c2a7d9c 100644
--- a/EmulatedVolume.cpp
+++ b/EmulatedVolume.cpp
@@ -59,8 +59,8 @@
         return -errno;
     }
 
-    setPath(mFusePath);
     setInternalPath(mRawPath);
+    setPath(mFusePath);
 
     if (!(mFusePid = fork())) {
         // TODO: protect when not mounted as visible

PublicVolume.cpp

diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index 025d2eb..2b2c32b 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -107,6 +107,7 @@
 
     mRawPath = StringPrintf("/mnt/media_rw/%s", stableName.c_str());
     mFusePath = StringPrintf("/storage/%s", stableName.c_str());
+    setInternalPath(mRawPath);
     setPath(mFusePath);
 
     if (fs_prepare_dir(mRawPath.c_str(), 0700, AID_ROOT, AID_ROOT)) {