From 13ec4dd3fed2ebe401e7a96105f8125185de8a51 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Thu, 24 Aug 2017 00:46:24 +0100 Subject: shinano-common: rootdir: Update second RIL daemon service * Match the new changes introduced in O * Important sidenote: if the kernel doesn't support one of the capabilities, that's enough for the whole capability set to fail for that particular service. Previous to adding the full support for these capabilities into the kernel, the following was printed in the dmesg: init: init.variant.rc: 5: capability 'BLOCK_SUSPEND' not supported by the kernel While checking rild's capabilities (`cat /proc/$$/status`, where $$ is the PID), it could be seen that those were totally messed up: Name: rild ... Uid: 1001 1001 1001 1001 Gid: 1001 1001 1001 1001 ... Groups: 1005 1007 2001 2901 3003 3009 3010 9998 ... CapInh: 0000000000000000 CapPrm: 0000000000000000 CapEff: 0000000000000000 CapBnd: ffffffffffffffff CapAmb: 0000000000000000 ... After adding CAP_BLOCK_SUSPEND support to the kernel, it changed to: Name: rild ... Uid: 1001 1001 1001 1001 Gid: 1001 1001 1001 1001 ... Groups: 1005 1007 2001 2901 3003 3009 3010 9998 ... CapInh: 0000001000003000 CapPrm: 0000001000003000 CapEff: 0000001000003000 CapBnd: fffffff000003000 CapAmb: 0000001000003000 ... In this particular case, messed up capabilities resulted in broken mobile data. Change-Id: I8e5888ebeb4bcf26eed85a2c4dca320faad8f7e0 --- rootdir/etc/init.qcom.rc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'rootdir') diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 90e9e52..0053423 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -460,16 +460,14 @@ on property:ro.data.large_tcp_window_size=true # Adjust socket buffer to enlarge TCP receive window for high bandwidth (e.g. DO-RevB) write /proc/sys/net/ipv4/tcp_adv_win_scale 2 -service ril-daemon2 /system/bin/rild -c 2 - class late_start - socket rild2 stream 660 root radio - socket rild-debug2 stream 660 radio system - user root - disabled - group radio cache inet misc audio sdcard_r sdcard_rw oem_2950 log +service ril-daemon1 /vendor/bin/hw/rild -c 2 + class main + user radio + group radio cache inet misc audio log readproc wakelock + capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW on property:persist.radio.multisim.config=dsds - start ril-daemon2 + start ril-daemon1 # Start suntrold service suntrold /vendor/bin/suntrold -- cgit v1.2.3