4.2-ization

Change-Id: I3e076d14c4a9c90d6b58798ac6d4dc04936d3103

5 files changed, 22 insertions, 16 deletions

diff --git a/i9300.mk b/i9300.mk
index 17f8184..632aa5c 100644
--- a/i9300.mk
+++ b/i9300.mk
@@ -52,8 +52,9 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     GalaxyS3Settings \
     libsecril-client \
-    libsecril-client-sap \
-    SamsungServiceMode
+    libsecril-client-sap
+
+#    SamsungServiceMode
 
 # NFC
 PRODUCT_PACKAGES += \
diff --git a/init.smdk4x12.rc b/init.smdk4x12.rc
index b3037fb..849ef73 100755
--- a/init.smdk4x12.rc
+++ b/init.smdk4x12.rc
@@ -1,17 +1,21 @@
 import init.smdk4x12.usb.rc
 import init.bt.rc
 
-on early-init
-    export EXTERNAL_STORAGE /storage/sdcard0
-    export SECONDARY_STORAGE /storage/sdcard1
+on init
+    mkdir /mnt/shell/emulated 0700 shell shell
     mkdir /storage 0550 system sdcard_r
-    mkdir /storage/sdcard0 0000 system system
-    mkdir /storage/sdcard1 0775 system system
-    mkdir /storage/usbdisk0 0775 system system
+    mkdir /storage/emulated 0555 root root
+
+    export EXTERNAL_STORAGE /storage/emulated/legacy
+    export SECONDARY_STORAGE /storage/sdcard1
+    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
@@ -409,8 +413,8 @@ on property:ro.uart_debug=0
 # create virtual SD card at /mnt/sdcard, based on the /data/media directory
 # daemon will drop to user/group system/media_rw after initializing
 # underlying files in /data/media wil 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
 
 # icd
 service icd /system/bin/icd
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 25f9b29..1f51994 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -95,10 +95,10 @@
     <bool name="config_disableMenuKeyInLockScreen">true</bool>
 
     <!-- Disable the home key unlock setting -->
-    <bool name="config_disableHomeUnlockSetting">false</bool>
+<!--    <bool name="config_disableHomeUnlockSetting">false</bool> -->
 
     <!-- Workaround for devices with broken keyboards -->
-    <bool name="config_forceDisableHardwareKeyboard">true</bool>
+<!--    <bool name="config_forceDisableHardwareKeyboard">true</bool> -->
 
     <!-- Hardware 'face' keys present on the device, stored as a bit field.
          This integer should equal the sum of the corresponding value for each
@@ -110,6 +110,6 @@
             16 - App switch
          For example, a device with Home, Back and Menu keys would set this
          config to 7. -->
-    <integer name="config_deviceHardwareKeys">7</integer>
+<!--    <integer name="config_deviceHardwareKeys">7</integer> -->
 
 </resources>
diff --git a/overlay/packages/apps/Phone/res/values/config.xml b/overlay/packages/apps/Phone/res/values/config.xml
index 23ec4e4..e4a07c1 100644
--- a/overlay/packages/apps/Phone/res/values/config.xml
+++ b/overlay/packages/apps/Phone/res/values/config.xml
@@ -21,5 +21,5 @@
     <bool name="has_in_call_noise_suppression">true</bool>
 
     <!-- Audio parameter for setting noise suppression-->
-    <string name="in_call_noise_suppression_audioparameter">noise_suppression=true=false</string>
+<!--    <string name="in_call_noise_suppression_audioparameter">noise_suppression=true=false</string> -->
 </resources>
diff --git a/system.prop b/system.prop
index 8f98f1d..47d42de 100644
--- a/system.prop
+++ b/system.prop
@@ -2,6 +2,7 @@
 # system.prop for smdk4x12
 #
 
+dalvik.vm.dexopt-data-only=1
 rild.libpath=/system/lib/libsec-ril.so
 rild.libargs=-d /dev/ttyS0
 ro.sf.lcd_density=320