qcrild.rc: add new ril services

the new RIL provided by v4 is using a new ril service

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>

common-init.mk

@@ -25,23 +25,31 @@ PRODUCT_PACKAGES += \
     dataqti.rc \
     dpmQmiMgr.rc \
     dpmd.rc \
+    imsdaemon.rc \
     imsdatadaemon.rc \
     imsqmidaemon.rc \
     imsrcsd.rc \
     ims_rtp_daemon.rc \
     irsc_util.rc \
     mlog_qmi.rc \
     mdm_helper.rc \
+    mdmmgr.rc \
     msm_irq.rc \
+    mstatdaemon.rc \
     netmgrd.rc \
     pd_mapper.rc \
     per-proxy.rc \
     per-service.rc \
+    port-bridge.rc \
     qrtr.rc \
+    qmipriod.rc \
+    qesdk-manager \
     qseecom.rc \
     rmt_storage.rc \
     sct_service.rc \
+    shsusrd.rc \
     sensors.rc \
+    vendor.sensors.qesdk.rc \
     ta_qmi.rc \
     tftp_server.rc \
     vendor.qti.diag.rc \

common-odm.mk

@@ -118,6 +118,7 @@ PRODUCT_PACKAGES += \
     libqdi \
     libqdp \
     diag-router \
+    port-bridge \
     adpl\
     qdi \
     netmgrd
@@ -144,6 +145,7 @@ PRODUCT_PACKAGES += \
     libqmiservices_ext \
     libqrtr \
     libqsocket \
+    qmipriod \
     qti \
     qrtr-ns
 
@@ -154,13 +156,6 @@ PRODUCT_PACKAGES += \
 
 # IMS
 PRODUCT_PACKAGES += \
-    vendor.qti.hardware.data.lce@1.0 \
-    vendor.qti.hardware.data.flow@1.0 \
-    vendor.qti.hardware.data.dynamicdds@1.0 \
-    vendor.qti.hardware.data.dynamicdds@1.1 \
-    vendor.qti.ims.configservice@1.0 \
-    vendor.qti.latency@2.0 \
-    vendor.qti.latency@2.1 \
     libtime_genoff \
     qcrilhook \
     IWlanService \
@@ -191,24 +186,42 @@ PRODUCT_PACKAGES += \
     com.qualcomm.qti.uceservice@2.0 \
     com.qualcomm.qti.uceservice@2.1 \
     com.qualcomm.qti.uceservice@2.2 \
+    com.qualcomm.qti.uceservice@2.3 \
+    com.qualcomm.qti.uceservice-V2.0 \
+    com.qualcomm.qti.uceservice-V2.1 \
+    com.qualcomm.qti.uceservice-V2.2 \
+    com.qualcomm.qti.uceservice-V2.3 \
     com.qualcomm.qti.imscmservice@1.0 \
     com.qualcomm.qti.imscmservice@2.2 \
     vendor.qti.data.mwqem@1.0 \
     vendor.qti.hardware.mwqemadapter@1.0 \
     vendor.qti.data.factory@1.1 \
     vendor.qti.data.slm@1.0 \
     vendor.qti.hardware.data.connection@1.0 \
-    vendor.qti.hardware.data.latency@1.0 \
     vendor.qti.hardware.data.dynamicdds@1.0 \
+    vendor.qti.hardware.data.dynamicdds@1.1 \
+    vendor.qti.hardware.data.latency@1.0 \
+    vendor.qti.hardware.data.lce@1.0 \
+    vendor.qti.hardware.data.flow@1.0 \
     vendor.qti.hardware.data.qmi@1.0 \
     vendor.qti.hardware.radio.ims@1.0 \
+    vendor.qti.hardware.radio.ims@1.1 \
+    vendor.qti.hardware.radio.ims@1.2 \
+    vendor.qti.hardware.radio.ims@1.3 \
+    vendor.qti.hardware.radio.ims@1.4 \
+    vendor.qti.hardware.radio.ims@1.5 \
+    vendor.qti.hardware.radio.ims@1.6 \
+    vendor.qti.hardware.radio.ims@1.7 \
+    vendor.qti.hardware.radio.ims@1.8 \
     vendor.qti.ims.callcapability@1.0 \
     vendor.qti.ims.callinfo@1.0 \
+    vendor.qti.ims.configservice@1.0 \
     vendor.qti.ims.rcsconfig@1.1 \
     vendor.qti.ims.rcsconfig@2.1 \
     vendor.qti.imsrtpservice@1.0-service-Impl \
     vendor.qti.imsrtpservice@1.0 \
     vendor.qti.latency@2.0 \
+    vendor.qti.latency@2.1 \
     QtiTelephonyService \
     QtiTelephonyServicelibrary \
     uimgbalibrary \
@@ -257,6 +270,27 @@ PRODUCT_PACKAGES += \
 
 # Ril
 PRODUCT_PACKAGES += \
+    vendor.qti.hardware.radio.internal.deviceinfo@1.0 \
+    libqcrildatactl \
+    libqcrilDataModule \
+    libqcrilNrCellInfoModule \
+    libqcrilNrFramework \
+    libqcrilNrImsModule \
+    libqcrilNrLogger \
+    libqcrilNrPbmModule \
+    libqcrilNrQtiBus \
+    libqcrilNrQtiMutex \
+    libqcrilNrSmsModule \
+    libqcrilNr \
+    libqcrilNrSocketModule \
+    libqcrilNrVoiceModule \
+    qcrild_libqcrilnr \
+    qcrild_libqcrilnrutils \
+    qcrilInterfaces \
+    qcrilMarshal \
+    qcrilNrQmiModule \
+    vendor.qti.hardware.radio.qcrilhook@1.0 \
+    libqcrilNr \
     qcrilNrd
 
 PRODUCT_PACKAGES += \

common.mk

@@ -114,6 +114,9 @@ PRODUCT_COPY_FILES += \
 
 # Seccomp policy
 PRODUCT_COPY_FILES += \
+    $(COMMON_PATH)/rootdir/vendor/etc/seccomp_policy/qcrilnr@2.0.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/qcrilnr@2.0.policy \
+    $(COMMON_PATH)/rootdir/vendor/etc/seccomp_policy/modemManager.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/modemManager.policy \
+    $(COMMON_PATH)/rootdir/vendor/etc/seccomp_policy/qesdk.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/qesdk.policy \
     $(COMMON_PATH)/rootdir/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
     $(COMMON_PATH)/rootdir/vendor/etc/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy
 

rootdir/Android.bp

@@ -165,6 +165,13 @@ prebuilt_etc {
     vendor: true,
 }
 
+prebuilt_etc {
+    name: "imsdaemon.rc",
+    src: "vendor/etc/init/imsdaemon.rc",
+    sub_dir: "init",
+    vendor: true,
+}
+
 prebuilt_etc {
     name: "imsdatadaemon.rc",
     src: "vendor/etc/init/imsdatadaemon.rc",
@@ -207,20 +214,41 @@ prebuilt_etc {
     vendor: true,
 }
 
+prebuilt_etc {
+    name: "mdmmgr.rc",
+    src: "vendor/etc/init/mdmmgr.rc",
+    sub_dir: "init",
+    vendor: true,
+}
+
 prebuilt_etc {
     name: "msm_irq.rc",
     src: "vendor/etc/init/msm_irq.rc",
     sub_dir: "init",
     vendor: true,
 }
 
+prebuilt_etc {
+    name: "mstatdaemon.rc",
+    src: "vendor/etc/init/mstatdaemon.rc",
+    sub_dir: "init",
+    vendor: true,
+}
+
 prebuilt_etc {
     name: "netmgrd.rc",
     src: "vendor/etc/init/netmgrd.rc",
     sub_dir: "init",
     vendor: true,
 }
 
+prebuilt_etc {
+    name: "port-bridge.rc",
+    src: "vendor/etc/init/port-bridge.rc",
+    sub_dir: "init",
+    vendor: true,
+}
+
 prebuilt_etc {
     name: "per-proxy.rc",
     src: "vendor/etc/init/per-proxy.rc",
@@ -319,6 +347,20 @@ prebuilt_etc {
     vendor: true,
 }
 
+prebuilt_etc {
+    name: "qesdk-manager.rc",
+    src: "vendor/etc/init/qesdk-manager.rc",
+    sub_dir: "init",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "qmipriod.rc",
+    src: "vendor/etc/init/qmipriod.rc",
+    sub_dir: "init",
+    vendor: true,
+}
+
 prebuilt_etc {
     name: "rmt_storage.rc",
     src: "vendor/etc/init/rmt_storage.rc",
@@ -340,6 +382,20 @@ prebuilt_etc {
     vendor: true,
 }
 
+prebuilt_etc {
+    name: "vendor.sensors.qesdk.rc",
+    src: "vendor/etc/init/vendor.sensors.qesdk.rc",
+    sub_dir: "init",
+    vendor: true,
+}
+
+prebuilt_etc {
+    name: "shsusrd.rc",
+    src: "vendor/etc/init/shsusrd.rc",
+    sub_dir: "init",
+    vendor: true,
+}
+
 prebuilt_etc {
     name: "spu.rc",
     src: "vendor/etc/init/spu.rc",

rootdir/vendor/etc/init/hw/init.common.rc

@@ -143,16 +143,36 @@ on post-fs-data
     mkdir /data/vendor/bluetooth 2770 bluetooth bluetooth
 
     # Create the directories used by the Wireless subsystem
-    mkdir /data/misc/wifi 0770 wifi wifi
-    mkdir /data/misc/wifi/wpa_supplicant 0770 wifi wifi
     mkdir /data/vendor/wifi 0771 wifi wifi
+    mkdir /data/vendor/wifi/sockets 0770 wifi wifi
+    mkdir /data/vendor/wifi/hostapd 0770 wifi wifi
+    mkdir /data/vendor/wifi/hostapd/ctrl 0770 wifi wifi
+    mkdir /data/vendor/wifi/wpa_supplicant 0770 wifi wifi
+    mkdir /data/vendor/wifi/wigig_hostapd 0770 wifi wifi
     mkdir /data/vendor/wifi/wpa 0770 wifi wifi
     mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
+
+    # Create directories for wifihal services
+    mkdir /dev/socket/wifihal 0770 wifi wifi
+    chmod 2770 /dev/socket/wifihal
+
     mkdir /data/misc/dhcp 0770 dhcp dhcp
     chown dhcp dhcp /data/misc/dhcp
 
-    # Create directory for hostapd
-    mkdir /data/hostapd 0770 system wifi
+    # Create directory for radio
+    mkdir /data/vendor/radio 0770 system radio
+    rm /data/vendor/radio/shmbus
+
+    # Create directory for modem_config
+    mkdir /data/vendor/modem_config 0570 radio root
+
+    # File flags for prebuilt ril db file
+    write /data/vendor/radio/prebuilt_db_support 1
+    chown radio radio /data/vendor/radio/prebuilt_db_support
+    chmod 0400 /data/vendor/radio/prebuilt_db_support
+    write /data/vendor/radio/db_check_done 0
+    chown radio radio /data/vendor/radio/db_check_done
+    chmod 0660 /data/vendor/radio/db_check_done
 
     # create directory for scd
     mkdir /dev/socket/scd 0755 system system

rootdir/vendor/etc/init/imsdaemon.rc

@@ -0,0 +1,9 @@
+on post-fs-data
+    mkdir /data/vendor/imslogs 0770 radio radio
+    chmod 0770 /data/vendor/imslogs
+
+service vendor.imsdaemon /odm/bin/imsdaemon
+    class main
+    user radio
+    socket ims_datad stream 0660 system radio
+    group radio wifi inet diag log

rootdir/vendor/etc/init/mdmmgr.rc

@@ -0,0 +1,4 @@
+service vendor.modemManager /odm/bin/modemManager
+    class main
+    user radio
+    group radio

rootdir/vendor/etc/init/mstatdaemon.rc

@@ -0,0 +1,7 @@
+service vendor.mstatdaemon /odm/bin/mstatdaemon
+    class main
+    user radio
+    group radio
+
+on boot
+    setprop vendor.mstatservice.enable 1

rootdir/vendor/etc/init/netmgrd.rc

@@ -1,24 +1,20 @@
 on boot
-    #Create NETMGR daemon socket area
     mkdir /dev/socket/netmgr 0750 radio radio
 
+    write /proc/sys/net/core/rmem_max  16777216
+    write /proc/sys/net/core/wmem_max  8388608
+
 on post-fs-data
-    #create netmgr log dir
     mkdir /data/vendor/netmgr 0770 radio radio
     chmod 0770 /data/vendor/netmgr
 
-# NET Manager Daemon
+    mkdir /data/vendor/netmgr/recovery 0700 radio radio
+    chmod 0770 /data/vendor/netmgr/recovery
+    write /data/vendor/netmgr/recovery/recovery_info ""
+    chown radio radio /data/vendor/netmgr/recovery/recovery_info
+
 service vendor.netmgrd /odm/bin/netmgrd
     class main
-    user root
-    group root wifi wakelock radio inet
-    disabled
-
-on property:ro.boot.baseband=msm
-    enable vendor.netmgrd
-
-on property:ro.boot.baseband=sdm
-    enable vendor.netmgrd
 
-on property:ro.boot.baseband=mdm
-    enable vendor.netmgrd
+on property:ro.baseband=apq
+    disable vendor.netmgrd

rootdir/vendor/etc/init/port-bridge.rc

@@ -0,0 +1,12 @@
+on boot
+    mkdir /dev/socket/port-bridge 0750 radio radio
+
+on post-fs-data
+    mkdir /data/vendor/port_bridge 0770 radio radio
+    chmod 0770 /data/vendor/port_bridge
+
+service vendor.port-bridge /odm/bin/port-bridge
+    class main
+    user radio
+    group radio system inet
+    oneshot

rootdir/vendor/etc/init/qcrild.rc

@@ -1,3 +1,18 @@
+on boot
+    mkdir /dev/socket/qcrild 0750 radio radio
+
+service vendor.qcrilNrd /odm/bin/hw/qcrilNrd
+    class main
+    user radio
+    disabled
+    group radio cache inet misc audio log readproc wakelock
+    capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW
+
+on property:vendor.rild.svc=qcrilNrd
+    stop vendor.ril-daemon
+    enable vendor.qcrilNrd
+
+# Legacy
 service vendor.qcrild /odm/bin/hw/qcrild
     class main
     user radio