summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2012-11-24 08:18:10 +0100
committercodeworkx <codeworkx@cyanogenmod.org>2012-11-24 08:18:10 +0100
commita0c4cc2fb9b27891df96fb4552858999e354b812 (patch)
treeaae96f8343f2a08f4c5cd3c3b548077b908471df
parentc37c6f854e172811aaa73cecb9c1b8c8124405aa (diff)
downloaddevice_samsung_p5100-a0c4cc2fb9b27891df96fb4552858999e354b812.zip
device_samsung_p5100-a0c4cc2fb9b27891df96fb4552858999e354b812.tar.gz
device_samsung_p5100-a0c4cc2fb9b27891df96fb4552858999e354b812.tar.bz2
common: update emulated storage
Change-Id: I5f088afc76a6fc2f2e1dd74d16cdb1821eadd7b7
-rw-r--r--common-overlay/frameworks/base/core/res/res/xml/storage_list.xml4
-rwxr-xr-xinit.espresso10.rc25
2 files changed, 16 insertions, 13 deletions
diff --git a/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml b/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml
index 30c5bd6..c902ee3 100644
--- a/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/common-overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -33,9 +33,9 @@
-->
<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
- <storage android:mountPoint="/storage/sdcard0"
+ <!-- internal emulated storage -->
+ <storage
android:storageDescription="@string/storage_internal"
- android:primary="true"
android:emulated="true"
android:mtpReserve="100" />
diff --git a/init.espresso10.rc b/init.espresso10.rc
index f435c0f..bd9dd46 100755
--- a/init.espresso10.rc
+++ b/init.espresso10.rc
@@ -1,22 +1,25 @@
import init.espresso10.usb.rc
-on early-init
- export EXTERNAL_STORAGE /storage/sdcard0
+on init
+ mkdir /mnt/shell/emulated 0700 shell shell
+ mkdir /storage 0550 system sdcard_r
+ mkdir /storage/emulated 0555 root root
+
+ export EXTERNAL_STORAGE /storage/emulated/legacy
export SECONDARY_STORAGE /storage/sdcard1
- mkdir /storage 0050 system sdcard_r
- mkdir /storage/sdcard0 0000 system system
- mkdir /storage/sdcard1 0775 system system
- mkdir /storage/usbdisk0 0775 system system
+ export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
+ export EMULATED_STORAGE_TARGET /storage/emulated
# for backwards compatibility
- symlink /storage/sdcard0 /sdcard
- symlink /storage/sdcard0 /mnt/sdcard
+ symlink /storage/emulated/legacy /sdcard
+ symlink /storage/emulated/legacy /mnt/sdcard
+ symlink /storage/emulated/legacy /storage/sdcard0
+ symlink /mnt/shell/emulated/0 /storage/emulated/legacy
symlink /storage/sdcard1 /extSdCard
symlink /storage/sdcard1 /mnt/extSdCard
symlink /storage/usbdisk0 /usbdisk0
symlink /storage/usbdisk0 /mnt/usbdisk0
-on init
# Vibetonz
export VIBE_PIPE_PATH /dev/pipes
mkdir /dev/pipes 0771 shell shell
@@ -285,8 +288,8 @@ service geomagneticd /system/bin/geomagneticd
# create virtual SD card at /storage/sdcard0, based on the /data/media directory
# daemon will drop to user/group system/media_rw after initializing
# underlying files in /data/media will be created with user and group media_rw (1023)
-service sdcard /system/bin/sdcard /data/media 1023 1023
- class main
+service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
+ class late_start
service p2p_supplicant /system/bin/wpa_supplicant \
-Dnl80211 -iwlan0 -puse_p2p_group_interface=1 -c/data/misc/wifi/wpa_supplicant.conf -e/data/misc/wifi/entropy.bin