t0lte: updates for KK ril

Change-Id: I38444fd7b48db422ce4c4cc984ac0e88b6d00ea3

12 files changed, 69 insertions, 107 deletions

diff --git a/common.mk b/common.mk
index 2fe0d72..2499bc8 100644
--- a/common.mk
+++ b/common.mk
@@ -30,6 +30,12 @@ endif
 PRODUCT_AAPT_CONFIG := normal hdpi xhdpi
 PRODUCT_AAPT_PREF_CONFIG := xhdpi
 
+# Init files
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/rootdir/init.target.rc:root/init.target.rc \
+    $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc \
+    $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:recovery/root/ueventd.smdk4x12.rc
+
 # Audio
 PRODUCT_PACKAGES += \
     tiny_hw
diff --git a/overlay-cdma/frameworks/base/core/res/res/values/config.xml b/overlay-cdma/frameworks/base/core/res/res/values/config.xml
index e48be31..7bcf076 100755
--- a/overlay-cdma/frameworks/base/core/res/res/values/config.xml
+++ b/overlay-cdma/frameworks/base/core/res/res/values/config.xml
@@ -197,6 +197,6 @@
     <integer name="config_deviceHardwareWakeKeys">65</integer>
     
     <!-- Boolean to enable Stylus gestures -->
-    <!--<bool name="config_stylusGestures">true</bool>-->
+    <bool name="config_stylusGestures">true</bool>
 
 </resources>
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index 31da1c7..1c7bc3b 100644
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -5,7 +5,26 @@ on init
     export VIBE_PIPE_PATH /dev/pipes
     mkdir /dev/pipes 0771 shell shell
 
-    # MDM requirement
+on post-fs-data
+ #MDM requirement
+    mkdir /data/cp_log
+    chmod 0775 /data/cp_log
+    chown system radio /data/cp_log
+
+    mkdir /dev/block/modem
+    symlink /dev/block/platform/dw_mmc/by-name/m9kefs1 /dev/block/modem/m9kefs1
+    symlink /dev/block/platform/dw_mmc/by-name/m9kefs2 /dev/block/modem/m9kefs2
+    symlink /dev/block/platform/dw_mmc/by-name/m9kefs3 /dev/block/modem/m9kefs3
+    symlink /dev/block/platform/dw_mmc/by-name/ /dev/block/modem/dump_path
+    chown system radio /dev/block/modem/m9kefs1
+    chmod 0775 /dev/block/modem/m9kefs1
+    chown system radio /dev/block/modem/m9kefs2
+    chmod 0775 /dev/block/modem/m9kefs2
+    chown system radio /dev/block/modem/m9kefs3
+    chmod 0775 /dev/block/modem/m9kefs3
+    chown system radio /dev/block/modem/dump_path
+    chmod 0775 /dev/block/modem/dump_path
+
     mkdir /firmware 0771 system system
     chown system system /tombstones
     chmod 0775 /tombstones
@@ -18,14 +37,13 @@ on init
     rmdir /tombstones/efs
     mkdir /tombstones/efs 771 system system
 
-on post-fs-data
     chown system radio /dev/block/platform/dw_mmc/by-name
     chmod 0775 /dev/block/platform/dw_mmc/by-name
 
     # QCRIL
     # Create QMUX deamon socket area
-    mkdir /dev/socket/qmux_radio 0770 radio radio
-    chmod 2770 /dev/socket/qmux_radio
+    mkdir /dev/socket/qmux_radio 0777 radio radio
+    chmod 2777 /dev/socket/qmux_radio
     mkdir /dev/socket/qmux_audio 0770 media audio
     chmod 2770 /dev/socket/qmux_audio
     mkdir /dev/socket/qmux_gps 0770 gps gps
@@ -33,6 +51,7 @@ on post-fs-data
 
     # Allow QMUX daemon to assign port open wait time
     chown radio radio /sys/devices/virtual/hsicctl/hsicctl0/modem_wait
+    chmod 0666 /sys/devices/virtual/hsicctl/hsicctl0/modem_wait
 
     # To prevent out of order acknowledgements from making
     # connection tracking to treat them as not belonging to
@@ -83,6 +102,19 @@ on post-fs-data
     chown system radio /sys/class/sensors/ssp_sensor/ori_poll_delay
     chown system radio /sys/class/sensors/ssp_sensor/mag_poll_delay
 
+    #Create directories for gpsone_daemon services
+    mkdir /data/misc/gpsone_d 0770 system gps
+
+    #Create directories for QuIPS
+    mkdir /data/misc/quipc 0770 system gps
+
+    #Create directories for Location services
+    mkdir /data/misc/location 0770 gps gps
+    mkdir /data/misc/location/mq 0770 gps gps
+    mkdir /data/misc/location/xtwifi 0770 gps gps
+
+    chmod 0755 /proc/cmdline
+
 on boot
 
 on property:sys.boot_completed=1
@@ -91,7 +123,7 @@ on property:sys.boot_completed=1
 
 # AT Distributor for factory test
 service at_distributor /system/bin/at_distributor
-    class main
+    class late_start
     user root
     group radio log
 
@@ -101,9 +133,6 @@ service diag_uart_log /system/bin/diag_uart_log
     user root
     group radio
 
-service netmgrd /system/bin/netmgrd
-    class late_start
-
 service SMD-daemon /system/bin/smdexe
     class main
     user root
@@ -115,12 +144,6 @@ service qc_kickstart /system/bin/qcks s
     seclabel u:r:kickstart:s0
     group radio cache inet misc audio sdcard_rw log
 
-service secril-daemon /system/bin/sec-ril
-    class main
-    user root
-    seclabel u:r:secril-daemon:s0
-    group radio cache inet misc audio sdcard_rw qcom_diag log
-
 #For EncryptionMode - remove disabled, Modify class main
 service qmiproxy /system/bin/qmiproxy
     class main
@@ -131,8 +154,3 @@ service qmuxd /system/bin/qmuxd
     class main
     user system
     group radio log audio bluetooth gps log
-
-service gsiff_daemon /system/bin/gsiff_daemon
-    class late_start
-    user system
-    group qcom_oncrpc gps
diff --git a/rootdir/lpm.rc b/rootdir/lpm.rc
deleted file mode 100644
index 7285736..0000000
--- a/rootdir/lpm.rc
+++ /dev/null
@@ -1,71 +0,0 @@
-on early-init
-    start ueventd
-
-on init
-    export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin
-    export LD_LIBRARY_PATH /vendor/lib:/system/lib
-    export ANDROID_ROOT /system
-    export ANDROID_DATA /data
-    export EXTERNAL_STORAGE /sdcard
-
-    symlink /system/etc /etc
-
-    mkdir /sdcard
-    mkdir /preload
-    mkdir /system
-    mkdir /data
-    mkdir /cache
-    mkdir /efs
-    mkdir /tmp
-    mkdir /dbdata
-    mkdir /mnt 0775 root root
-    #mount /tmp /tmp tmpfs
-
-on early-fs
-    mount ext4 /dev/block/mmcblk0p13 /system ro wait noatime
-
-    mkdir /data/log 0777
-    chmod 0666 /dev/log/radio
-    chmod 0666 /dev/log/main
-    chmod 0666 /dev/log/event
-
-on boot
-#   write /sys/class/sec/switch/usb_sel PDA
-
-# CPU Frequency Governor
-    write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor pegasusq
-
-# EHCI runtime enable for LPA
-    write /sys/devices/platform/s5p-ehci/power/control auto
-
-    ifup lo
-    hostname localhost
-    domainname localdomain
-
-    class_start default
-
-service debuggerd /system/bin/debuggerd
-
-service ueventd /sbin/ueventd
-    critical
-
-service console /system/bin/sh
-    console
-
-service lpm /system/bin/lpm
-    user root
-
-# adbd is controlled by the persist.service.adb.enable system property
-service adbd /sbin/adbd
-    disabled
-
-# adbd on at boot in emulator
-on property:ro.kernel.qemu=1
-    start adbd
-
-on property:persist.service.adb.enable=1
-    start adbd
-
-on property:persist.service.adb.enable=0
-    stop adbd
-
diff --git a/rootdir/ueventd.smdk4x12.rc b/rootdir/ueventd.smdk4x12.rc
index 3e2aa44..fbe8cd2 100644
--- a/rootdir/ueventd.smdk4x12.rc
+++ b/rootdir/ueventd.smdk4x12.rc
@@ -1,7 +1,7 @@
 /dev/mali                 0666   system     system
 /dev/ump                  0666   system     graphics
 /dev/ion                  0666   system     system
-/dev/exynos-mem           0660   system     camera
+/dev/exynos-mem           0660   system     graphics
 
 /dev/media0               0660   system     system
 /dev/media1               0660   system     camera
@@ -24,9 +24,9 @@
 /dev/v4l-subdev16         0660   system     system
 /dev/v4l-subdev17         0660   system     system
 
-/dev/video0               0666   system     system
+/dev/video0               0666   system     camera
 /dev/video1               0666   system     camera
-/dev/video2               0666   system     system
+/dev/video2               0666   system     graphics
 /dev/video3               0666   system     system
 /dev/video4               0666   system     system
 /dev/video11              0666   system     system
@@ -65,15 +65,19 @@
 /dev/i2c-2                0660   system     system
 /dev/i2c-5                0660   system     system
 /dev/i2c-6                0660   system     system
+/dev/i2c-7                0660   system     system
 /dev/CEC                  0660   system     system
 /dev/HPD                  0660   system     system
 /dev/fimg2d               0666   system     graphics
 /dev/fmradio              0660   system     audio
 
-#ALP Audio
+#ULP Audio
 /dev/srp                  0660   system     audio
+/dev/srp_ctrl             0660   system     audio
+/dev/umts*                0660   system     radio
+/dev/block/mmcblk0p7	  0660	 system	    radio
 
-/dev/s3c-mfc              0666   system     graphics
+/dev/s3c-mfc              0666   media      graphics
 /dev/s5p-mfc              0666   system     graphics
 
 /dev/block/mmcblk0p7      0660   system     root
@@ -83,13 +87,15 @@
 /dev/block/mmcblk0p6      0660   system     radio
 /dev/block/mmcblk0p11     0660   system     radio
 /dev/mdm                  0660   system     system
+
 #CPRM
 /dev/block/mmcblk1	      0660   root	    system
-/dev/ttyUSB0              0666   system     system
-/dev/ttyUSB1              0666   system     radio
-/dev/ttyUSB2              0666   system     system
-/dev/hsic*                0660   system     radio
+/dev/ttyUSB0              0660   system     system
+/dev/ttyUSB1              0660   system     radio
+/dev/ttyUSB2              0660   system     system
+/dev/hsic*                0666   system     radio
 /dev/usb/lp*              0660   system     usb
+/dev/ttyGS0               0660   system     system
 
 /dev/ttySAC*	          0660	 root	    system
 /dev/umts*                0660   system     radio
diff --git a/selinux/file_contexts b/selinux/file_contexts
index c20f3bd..c42fa2c 100644
--- a/selinux/file_contexts
+++ b/selinux/file_contexts
@@ -62,7 +62,6 @@
 /system/bin/efsks                u:object_r:kickstart_exec:s0
 /system/bin/ks                   u:object_r:kickstart_exec:s0
 /system/bin/qcks                 u:object_r:kickstart_exec:s0
-/system/bin/sec-ril              u:object_r:secril-daemon_exec:s0
 
 # Sockets
 /dev/socket/qmux_audio(/.*)?     u:object_r:qmuxd_socket:s0
diff --git a/selinux/qmuxd.te b/selinux/qmuxd.te
index 12413a7..da255f2 100644
--- a/selinux/qmuxd.te
+++ b/selinux/qmuxd.te
@@ -33,6 +33,7 @@ allow qmuxd sysfs_wake_lock:file { append open };
 
 #Allow qmuxd to write in hsic specific transport
 allow qmuxd sysfs:file w_file_perms;
+allow qmuxd radio_device:file w_file_perms;
 
 allow qmuxd self:capability { setuid setgid setpcap dac_override };
 
diff --git a/selinux/radio.te b/selinux/radio.te
index da639c5..6dc99b0 100644
--- a/selinux/radio.te
+++ b/selinux/radio.te
@@ -1,2 +1,4 @@
 # Talk to qmuxd (/dev/socket/qmux_radio)
-qmux_socket(radio) ;
\ No newline at end of file
+qmux_socket(radio) ;
+
+allow radio secril-daemon:unix_stream_socket { connectto };
\ No newline at end of file
diff --git a/selinux/rild.te b/selinux/rild.te
index 96d30df..7b6dd21 100755
--- a/selinux/rild.te
+++ b/selinux/rild.te
@@ -25,3 +25,4 @@ allow rild system_data_file:file create_file_perms;
 allow rild rild:process execmem;
 allow rild diagnostic_device:chr_file { read write open };
 allow rild radio_data_file:dir { setattr };
+allow rild init:unix_stream_socket { read write };
diff --git a/selinux/secril.te b/selinux/secril.te
index f6fa610..1b1cc0a 100644
--- a/selinux/secril.te
+++ b/selinux/secril.te
@@ -32,4 +32,7 @@ allow secril-daemon unlabeled:file { read open getattr setattr };
 #allow secril-daemon system_file:file { entrypoint };
 allow secril-daemon radio_data_file:dir { search write add_name read open remove_name };
 allow secril-daemon efs_file:dir { search };
+allow secril-daemon rild_exec:file { entrypoint read };
+allow secril-daemon qmuxd_socket:dir { write add_name remove_name search };
+allow secril-daemon qmuxd_socket:sock_file { create setattr unlink };
 
diff --git a/system.prop b/system.prop
index 9f07ee4..d555733 100644
--- a/system.prop
+++ b/system.prop
@@ -2,7 +2,7 @@
 # system.prop for t0lte
 #
 
-rild.libpath=/system/lib/libril-qc-qmi-1.so
+rild.libpath=/system/lib/libsec-ril.so
 rild.libargs=-d /dev/ttyS0
 ro.telephony.default_network=9
 telephony.lteOnGsmDevice=1
@@ -17,4 +17,4 @@ persist.radio.adb_log_on=1
 persist.radio.add_power_save=1
 
 # System property for SIM
-persist.radio.apm_sim_not_pwdn=1
+persist.radio.apm_sim_not_pwdn=0
diff --git a/t0lte.mk b/t0lte.mk
index 08b6db3..59bab86 100644
--- a/t0lte.mk
+++ b/t0lte.mk
@@ -19,9 +19,6 @@ LOCAL_PATH := device/samsung/t0lte
 # Init files
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/rootdir/fstab.smdk4x12:root/fstab.smdk4x12 \
-    $(LOCAL_PATH)/rootdir/init.target.rc:root/init.target.rc \
-    $(LOCAL_PATH)/rootdir/lpm.rc:root/lpm.rc \
-    $(LOCAL_PATH)/rootdir/ueventd.smdk4x12.rc:root/ueventd.smdk4x12.rc
 
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml