commit 47f0531ec9adf7a29873ccdb11a1ee7b11e76c80
author Jeff Sharkey <jsharkey@android.com> Thu Aug 06 21:31:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 21:31:57 2015 +0000
tree fd0ad13f0448fa486f0d00ea5a286305d40d77f2
parent 6d71977d142f42a4646f23c2fba79fed4fbfd7d7
parent 4fc30636065aa819a866cfcb3962d55b37db3312

am 4fc30636: am 1bd078fa: Protect runtime storage mount points.

* commit '4fc30636065aa819a866cfcb3962d55b37db3312':
  Protect runtime storage mount points.

EmulatedVolume.cpp

diff --git a/EmulatedVolume.cpp b/EmulatedVolume.cpp
index f1ca97b..6e440cc 100644
--- a/EmulatedVolume.cpp
+++ b/EmulatedVolume.cpp
@@ -61,9 +61,9 @@
         label = "emulated";
     }
 
-    mFuseDefault = StringPrintf("/mnt/runtime_default/%s", label.c_str());
-    mFuseRead = StringPrintf("/mnt/runtime_read/%s", label.c_str());
-    mFuseWrite = StringPrintf("/mnt/runtime_write/%s", label.c_str());
+    mFuseDefault = StringPrintf("/mnt/runtime/default/%s", label.c_str());
+    mFuseRead = StringPrintf("/mnt/runtime/read/%s", label.c_str());
+    mFuseWrite = StringPrintf("/mnt/runtime/write/%s", label.c_str());
 
     setInternalPath(mRawPath);
     setPath(StringPrintf("/storage/%s", label.c_str()));

PublicVolume.cpp

diff --git a/PublicVolume.cpp b/PublicVolume.cpp
index 2a93213..eb550c3 100644
--- a/PublicVolume.cpp
+++ b/PublicVolume.cpp
@@ -112,9 +112,9 @@
 
     mRawPath = StringPrintf("/mnt/media_rw/%s", stableName.c_str());
 
-    mFuseDefault = StringPrintf("/mnt/runtime_default/%s", stableName.c_str());
-    mFuseRead = StringPrintf("/mnt/runtime_read/%s", stableName.c_str());
-    mFuseWrite = StringPrintf("/mnt/runtime_write/%s", stableName.c_str());
+    mFuseDefault = StringPrintf("/mnt/runtime/default/%s", stableName.c_str());
+    mFuseRead = StringPrintf("/mnt/runtime/read/%s", stableName.c_str());
+    mFuseWrite = StringPrintf("/mnt/runtime/write/%s", stableName.c_str());
 
     setInternalPath(mRawPath);
     if (getMountFlags() & MountFlags::kVisible) {

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index ddb7517..ce355df 100755
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -580,11 +580,11 @@
 
             std::string storageSource;
             if (mode == "default") {
-                storageSource = "/mnt/runtime_default";
+                storageSource = "/mnt/runtime/default";
             } else if (mode == "read") {
-                storageSource = "/mnt/runtime_read";
+                storageSource = "/mnt/runtime/read";
             } else if (mode == "write") {
-                storageSource = "/mnt/runtime_write";
+                storageSource = "/mnt/runtime/write";
             } else {
                 // Sane default of no storage visible
                 _exit(0);