i9305: update propietary blobs

Change-Id: Ida03a5af102aa04a32a1d55f11eca409ab623859

6 files changed, 33 insertions, 22 deletions

diff --git a/i9305.mk b/i9305.mk
index a447c7a..6c40ad5 100644
--- a/i9305.mk
+++ b/i9305.mk
@@ -86,7 +86,7 @@ $(call inherit-product, vendor/cm/config/nfc_enhanced.mk)
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.telephony.ril_class=SamsungQualcommRIL \
     mobiledata.interfaces=pdp0,wlan0,gprs,ppp0 \
-    ro.telephony.ril.v3=exynos4RadioState
+    ro.telephony.ril.v3=newDriverCall,newDialCode
 
 # These are the hardware-specific features
 PRODUCT_COPY_FILES += \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 0b7a5b2..547056d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,13 +1,10 @@
 system/bin/at_distributor
 system/bin/efsks
-system/bin/gsiff_daemon
 system/bin/ks
-system/bin/netmgrd
 system/bin/qcks
 system/bin/qmiproxy
 system/bin/qmuxd
 system/bin/rild
-system/bin/sec-ril
 system/bin/smdexe
 system/etc/Diag.cfg
 system/etc/Diag_zero.cfg
@@ -16,6 +13,7 @@ system/lib/libatparser.so
 system/lib/libcsd-client.so
 system/lib/libdiag.so
 system/lib/libdsi_netctrl.so
+system/lib/libdss.so
 system/lib/libdsutils.so
 system/lib/libfactoryutil.so
 system/lib/libidl.so
@@ -33,8 +31,9 @@ system/lib/libqmi_csi.so
 system/lib/libqmi_encdec.so
 system/lib/libqmiservices.so
 system/lib/libril.so
-system/lib/libril-qc-qmi-1.so
 system/lib/libril-qcril-hook-oem.so
 system/lib/libsecnativefeature.so
 system/lib/libsecril-client.so
+system/lib/libsec-ril.so
 system/usr/keylayout/sec_touchkey.kl
+
diff --git a/rootdir/init.target.rc b/rootdir/init.target.rc
index dbbc773..c2d8c5c 100644
--- a/rootdir/init.target.rc
+++ b/rootdir/init.target.rc
@@ -6,6 +6,24 @@ on init
     mkdir /dev/pipes 0771 shell shell
 
     # 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
@@ -24,8 +42,8 @@ on post-fs-data
 
     #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 666 /sys/devices/virtual/hsicctl/hsicctl0/modem_wait
 
     # To prevent out of order acknowledgements from making
     # connection tracking to treat them as not belonging to
@@ -85,7 +104,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
 
@@ -109,11 +128,12 @@ 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
+service ril-daemon /system/bin/rild
     class main
+    socket rild stream 666 root radio
+    socket rild-debug stream 666 radio system
     user root
-    seclabel u:r:secril-daemon:s0
-    group radio cache inet misc audio sdcard_rw qcom_diag log
+    group radio cache inet misc audio sdcard_rw qcom_oncrpc diag log sdcard_r
 
 #For EncryptionMode - remove disabled, Modify class main
 service qmiproxy /system/bin/qmiproxy
@@ -123,16 +143,10 @@ service qmiproxy /system/bin/qmiproxy
 
 service qmuxd /system/bin/qmuxd
     class main
-    user system
+    user root
     seclabel u:r:qmux:s0
     group radio log audio bluetooth gps log
 
-#start GNSS/Sensor interface daemon
-service gsiff_daemon /system/bin/gsiff_daemon
-    class late_start
-    user system
-    group qcom_oncrpc gps
-
 # TVout
 service TvoutService_C /system/bin/bintvoutservice
     class main
diff --git a/rootdir/ueventd.smdk4x12.rc b/rootdir/ueventd.smdk4x12.rc
index 39089e3..b0027fb 100644
--- a/rootdir/ueventd.smdk4x12.rc
+++ b/rootdir/ueventd.smdk4x12.rc
@@ -86,7 +86,7 @@
 #CPRM
 /dev/block/mmcblk1	      0660   root	    system
 /dev/ttyUSB0              0666   system     system
-/dev/ttyUSB1              0666   system     system
+/dev/ttyUSB1              0666   system     radio
 /dev/ttyUSB2              0666   system     system
 /dev/hsic*                0660   system     radio
 /dev/usb/lp*              0660   system     usb
diff --git a/selinux/file_contexts b/selinux/file_contexts
index 8fbf038..36dc14c 100644
--- a/selinux/file_contexts
+++ b/selinux/file_contexts
@@ -51,11 +51,9 @@
 
 # Binaries
 /system/bin/qmuxd                u:object_r:qmux_exec:s0
-/system/bin/netmgrd              u:object_r:netmgrd_exec:s0
 /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/system.prop b/system.prop
index 938f558..8aa4216 100644
--- a/system.prop
+++ b/system.prop
@@ -2,7 +2,7 @@
 # system.prop for i9305
 #
 
-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