From d42f625b12e42b40a87235b5e2ed3c9c916d8c50 Mon Sep 17 00:00:00 2001
From: Pawit Pornkitprasan <p.pawit@gmail.com>
Date: Sun, 22 Apr 2012 12:25:46 +0700
Subject: aries-common: Switch emmc and sdcard

To match CM standard. Not touching recovery right now as that can
cause a lot of problems.

Change-Id: I09940553b16e84a396271fcad547eb21f7eb8474
---
 device_base.mk                                            | 6 ++++--
 overlay/frameworks/base/core/res/res/xml/storage_list.xml | 8 ++++----
 vold.fstab                                                | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/device_base.mk b/device_base.mk
index ec30a95..362e6db 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -146,6 +146,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
        ro.telephony.ril_class=SamsungRIL \
        ro.telephony.ril.v3=icccardstatus,datacall,signalstrength,facilitylock \
        mobiledata.interfaces=pdp0,eth0,gprs,ppp0 \
+       ro.vold.switchablepair=/mnt/emmc,/mnt/sdcard \
 
 # enable Google-specific location features,
 # like NetworkLocationProvider and LocationCollector
@@ -169,9 +170,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.dexopt-data-only=1
 
-# Set default USB interface
+# Set default USB interface and default to internal SD as /sdcard
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
-    persist.sys.usb.config=mass_storage
+    persist.sys.usb.config=mass_storage \
+    persist.sys.vold.switchexternal=1
 
 include frameworks/base/build/phone-hdpi-512-dalvik-heap.mk
 
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 6e511b7..c82a293 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -34,14 +34,14 @@
 
 <StorageList xmlns:android="http://schemas.android.com/apk/res/android">
     <storage android:mountPoint="/mnt/sdcard"
-             android:storageDescription="@string/storage_usb"
+             android:storageDescription="@string/storage_sd_card"
              android:primary="true"
-             android:removable="false"
+             android:removable="true"
              android:allowMassStorage="true" />
 
     <storage android:mountPoint="/mnt/emmc"
-             android:storageDescription="@string/storage_sd_card"
+             android:storageDescription="@string/storage_usb"
              android:primary="false"
-             android:removable="true"
+             android:removable="false"
              android:allowMassStorage="true" />
 </StorageList>
diff --git a/vold.fstab b/vold.fstab
index b1a2880..4e59bc1 100644
--- a/vold.fstab
+++ b/vold.fstab
@@ -13,7 +13,7 @@
 ######################
 
 # internal sdcard
-dev_mount sdcard /mnt/sdcard 1 /devices/platform/s3c-sdhci.0/mmc_host/mmc0
+dev_mount sdcard /mnt/emmc 1 /devices/platform/s3c-sdhci.0/mmc_host/mmc0
 
 # external sdcard
-dev_mount emmc /mnt/emmc auto /devices/platform/s3c-sdhci.2/mmc_host/mmc2
\ No newline at end of file
+dev_mount emmc /mnt/sdcard auto /devices/platform/s3c-sdhci.2/mmc_host/mmc2
\ No newline at end of file
-- 
cgit v1.1