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: Ie75c9966c899d1da5a204478ddeb3aeee65eb323
diff --git a/init.manta.rc b/init.manta.rc
index ba367c4..5120bc2 100644
--- a/init.manta.rc
+++ b/init.manta.rc
@@ -4,20 +4,23 @@
start watchdogd
# 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
@@ -74,7 +77,7 @@
mkdir /data/nfc/param 770 nfc nfc
# 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 \