commit 81f55c6dc1a14ed68e404fa3a2c244dd343e4990
author Jeff Sharkey <jsharkey@android.com> Tue Jul 07 14:37:03 2015 -0700
committer Jeff Sharkey <jsharkey@android.com> Wed Jul 08 14:07:39 2015 -0700
tree f52c87ae5d93c8a9d1c83d6f80ff2531b2acf1c7
parent c86ab6f538bec63638c168d6c843fe7cf73add3b

Mount emulated volumes as consistent location.

We really only support a single emulated volume on the device at a
time, either on internal storage, or moved to a private volume.  To
avoid kicking off a giant rescan of all media when moved, keep all
the paths the same when mounted as primary.

Also ensure we have /data/media/0 ready on private volumes.

Bug: 20275423
Change-Id: I0c102f430b865ca7536772b1fae56d8c9660a97a

PrivateVolume.cpp

diff --git a/PrivateVolume.cpp b/PrivateVolume.cpp
index 74b6b5b..6ddef3f 100644
--- a/PrivateVolume.cpp
+++ b/PrivateVolume.cpp
@@ -159,6 +159,7 @@
     if (PrepareDir(mPath + "/app", 0771, AID_SYSTEM, AID_SYSTEM) ||
             PrepareDir(mPath + "/user", 0711, AID_SYSTEM, AID_SYSTEM) ||
             PrepareDir(mPath + "/media", 0770, AID_MEDIA_RW, AID_MEDIA_RW) ||
+            PrepareDir(mPath + "/media/0", 0770, AID_MEDIA_RW, AID_MEDIA_RW) ||
             PrepareDir(mPath + "/local", 0751, AID_ROOT, AID_ROOT) ||
             PrepareDir(mPath + "/local/tmp", 0771, AID_SHELL, AID_SHELL)) {
         PLOG(ERROR) << getId() << " failed to prepare";