Include user identifier in external storage paths.

When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Bug: 7131382
Change-Id: Ic065fb8739a9d5d6e7f88ab93932391d906fed57
diff --git a/init.tuna.rc b/init.tuna.rc
index 530330f..c850128 100755
--- a/init.tuna.rc
+++ b/init.tuna.rc
@@ -2,20 +2,23 @@
 
 on init
     # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell/sdcard0 0700 shell shell
-    mkdir /storage/sdcard0 0000 root root
+    mkdir /mnt/shell/emulated 0700 shell shell
+    mkdir /storage/emulated 0000 root root
+    mkdir /storage/emulated_legacy 0000 root root
 
-    export EXTERNAL_STORAGE /storage/sdcard0
-    export ADB_EXTERNAL_STORAGE /mnt/shell/sdcard0/0
-    export MULTIUSER_EXTERNAL_STORAGE /mnt/shell/sdcard0
+    export EXTERNAL_STORAGE /storage/emulated_legacy
+    export ADB_EXTERNAL_STORAGE /mnt/shell/emulated/0
+
+    export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
+    export EMULATED_STORAGE_TARGET /storage/emulated
 
     # Support legacy paths
-    symlink /storage/sdcard0 /sdcard
-    symlink /storage/sdcard0 /mnt/sdcard
+    symlink /storage/emulated_legacy /sdcard
+    symlink /storage/emulated_legacy /mnt/sdcard
 
     # Save bugreports as owner
-    export BUGREPORT_WRITE_PATH /mnt/shell/sdcard0/0
-    export BUGREPORT_READ_PATH /storage/sdcard0
+    export BUGREPORT_WRITE_PATH /mnt/shell/emulated/0
+    export BUGREPORT_READ_PATH /storage/emulated
 
 on post-fs-data
     mkdir /data/media 0770 media_rw media_rw
@@ -166,7 +169,7 @@
         oneshot
 
 # virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard /data/media /mnt/shell/sdcard0 1023 1023
+service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
     class late_start
 
 service p2p_supplicant /system/bin/wpa_supplicant \
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
index 0a03928..344fe1e 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -17,25 +17,12 @@
 */
 -->
 
-<!-- The <device> element should contain one or more <storage> elements.
-     Exactly one of these should have the attribute primary="true".
-     This storage will be the primary external storage and should have path="/mnt/sdcard".
-     Each storage should have both a path and description attribute set.
-     The following boolean attributes are optional:
-
-        primary:    this storage is the primary external storage
-        removable:  this is removable storage (for example, a real SD card)
-        emulated:   the storage is emulated via the FUSE sdcard daemon
-        mtp-reserve: number of megabytes of storage MTP should reserve for free storage
-                     (used for emulated storage that is shared with system's data partition)
-
-      A storage should not have both emulated and removable set to true
--->
+<!-- See storage config details at http://source.android.com/tech/storage/ -->
 
 <StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-    <storage android:mountPoint="/storage/sdcard0"
-             android:storageDescription="@string/storage_internal"
-             android:primary="true"
-             android:emulated="true"
-             android:mtpReserve="100" />
+    <!-- internal emulated storage -->
+    <storage
+        android:storageDescription="@string/storage_internal"
+        android:emulated="true"
+        android:mtpReserve="100" />
 </StorageList>