applied dmitrygr android 6 patch

3 files changed, 15 insertions, 22 deletions

diff --git a/device.mk b/device.mk
index e0ea3391b65..b2d83cf7eb2 100644
--- a/device.mk
+++ b/device.mk
@@ -15,9 +15,10 @@
 #
 
 # rild
-PRODUCT_PACKAGES := \
+PRODUCT_PACKAGES += \
     rild \
-    BasicSmsReceiver
+    BasicSmsReceiver \
+    libstlport
 
 PRODUCT_COPY_FILES := \
     device/asus/tilapia/fstab.grouper:root/fstab.grouper \
diff --git a/init.tilapia.rc b/init.tilapia.rc
index 2a48c3f32c8..a9a7fcdce7e 100644
--- a/init.tilapia.rc
+++ b/init.tilapia.rc
@@ -4,25 +4,16 @@ on early-init
     mount debugfs debugfs /sys/kernel/debug
 
 on init
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage/emulated 0555 root root
-
-    export EXTERNAL_STORAGE /storage/emulated/legacy
-    export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
-    export EMULATED_STORAGE_TARGET /storage/emulated
-
-    # Support legacy paths
-    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
+    # Set init and its forked children's oom_adj.
+    write /proc/1/oom_score_adj -1000
+    mount debugfs debugfs /sys/kernel/debug
 
 on early-boot
     write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor interactive
     write /sys/devices/system/cpu/cpu1/cpufreq/scaling_governor interactive
     write /sys/devices/system/cpu/cpu2/cpufreq/scaling_governor interactive
     write /sys/devices/system/cpu/cpu3/cpufreq/scaling_governor interactive
+	
 
 on fs
     mkdir /factory 0775 radio radio
@@ -287,7 +278,7 @@ on boot
     chmod 0664 /sys/class/gpio/gpio162/value
     mkdir /data/gps
     chown gps system /data/gps
-    chmod 770 /data/gps
+    chmod 1770 /data/gps
     chown gps system /dev/ttyHS1
     chmod 0660 /dev/ttyHS1
 
@@ -402,10 +393,6 @@ service sensors-config /system/bin/sensors-config
     oneshot
 #Sensor load calibration files end
 
-# virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -t 4 -l /data/media /mnt/shell/emulated
-    class late_start
-
 # bugreport is triggered by the VOLUME-DOWN and VOLUME-UP keys
 service bugreport /system/bin/dumpstate -d -p -B \
         -o /data/data/com.android.shell/files/bugreports/bugreport
@@ -415,7 +402,7 @@ service bugreport /system/bin/dumpstate -d -p -B \
     keycodes 115 114
 
 # Start GPS daemon
-service gps-daemon /system/bin/glgps -c /system/etc/gps/gpsconfig.xml
+service gps-daemon /system/bin/gps_daemon.sh
   user gps
   group system
   class late_start
@@ -450,7 +437,7 @@ service setup_fs /system/bin/setup_fs \
     group root
     oneshot
 
-service touch_fw_update /system/bin/sh -c "echo /system/etc/firmware/touch_fw.ekt > /sys/bus/i2c/drivers/elan-ktf3k/1-0010/update_fw"
+service touch_fw_update /system/bin/touch_fw_update.sh
     class main
     disabled
     user root
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 33e6855abe8..ec2f0eef9b4 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -87,6 +87,11 @@
     The default represents a dual-mode smartphone -->
     <string translatable="false" name="config_wifi_p2p_device_type">1-0050F204-1</string>
 
+    <bool name="config_ui_enableFadingMarquee">false</bool>
+
+    <!-- Set lowmemorykiller threshold -->
+    <integer name="config_lowMemoryKillerMinFreeKbytesAbsolute">16384</integer>
+
     <!-- List of file paths for USB host busses to exclude from USB host support.
          For example, if the first USB bus on the device is used to communicate
          with the modem or some other restricted hardware, add "/dev/bus/usb/001/"