From 494bcaafdbdfbee8ebd94a541aa37cbe7e12f19f Mon Sep 17 00:00:00 2001 From: Simon1511 Date: Wed, 31 Jul 2024 14:53:01 +0200 Subject: [PATCH] a71-common: Switch to U RIL - Pull RIL and QMI blobs from A715FXXSBDXB1 (T) - Build sehradiomanager for working signal strength - Update SMSC and slotID patches accordingly - Build vendor.samsung.hardware.radio@2.[0,1,2] from source Change-Id: Icb3596c38d8f86db9813ff5f8586b7602c6bd80f --- BoardConfigCommon.mk | 1 - audio/impl/PrimaryDevice.cpp | 33 ++- common.mk | 7 + extract-files.sh | 8 +- proprietary-files.txt | 201 +++++++++--------- .../vendor/etc/init/init.vendor.rilchip.rc | 20 +- .../vendor/etc/init/init.vendor.rilcommon.rc | 8 +- sepolicy/vendor/file_contexts | 1 + sepolicy/vendor/sehradiomanager.te | 13 ++ sepolicy/vendor/service_contexts | 14 ++ vendor.prop | 1 - 11 files changed, 173 insertions(+), 134 deletions(-) create mode 100644 sepolicy/vendor/sehradiomanager.te diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index ce9b64d..552c731 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -234,7 +234,6 @@ TARGET_USERIMAGES_USE_F2FS := true TARGET_RELEASETOOLS_EXTENSIONS := $(COMMON_PATH)/releasetools # RIL -BOARD_PROVIDES_LIBRIL := true ENABLE_VENDOR_RIL_SERVICE := true # Rootfs diff --git a/audio/impl/PrimaryDevice.cpp b/audio/impl/PrimaryDevice.cpp index 4676013..8587a24 100644 --- a/audio/impl/PrimaryDevice.cpp +++ b/audio/impl/PrimaryDevice.cpp @@ -200,32 +200,31 @@ Return PrimaryDevice::setVoiceVolume(float volume) { Return PrimaryDevice::setMode(AudioMode mode) { /* On stock ROM Samsung sets the g_call_state and g_call_sim_slot audio parameters - * in the framework, breaking it on AOSP ROMs. For the audio params call_state and - * g_call_state 2 corresponds to CALL_ACTIVE and 1 to CALL_INACTIVE respectively. + * in the framework, breaking it on AOSP ROMs. * For the g_call_sim_slot parameter 0x01 describes SIM1 and 0x02 SIM2. */ - char simSlot[92]; + char simSlot1[92], simSlot2[92]; - // This prop returns either -1 (no SIM is calling), - // 0 (SIM1 is calling) or 1 (SIM2 is calling) - property_get("vendor.calls.slotid", simSlot, ""); + // These props return either 0 (not calling), + // or 1 (SIM is calling) + property_get("vendor.calls.slot_id0", simSlot1, ""); + property_get("vendor.calls.slot_id1", simSlot2, ""); - // Wait until RIL reports which SIM is being used - while (strcmp(simSlot, "-1") == 0 && mode == AudioMode::IN_CALL) { - std::this_thread::sleep_for(std::chrono::milliseconds(50)); - property_get("vendor.calls.slotid", simSlot, ""); + // Wait until one sim slot reports a call + if (mode == AudioMode::IN_CALL) { + while (strcmp(simSlot1, "0") == 0 && strcmp(simSlot2, "0") == 0) { + property_get("vendor.calls.slot_id0", simSlot1, ""); + property_get("vendor.calls.slot_id1", simSlot2, ""); + } } - if (strcmp(simSlot, "0") == 0) { + if (strcmp(simSlot1, "1") == 0) { // SIM1 - mDevice->halSetParameters("call_state=2;g_call_state=2;g_call_sim_slot=0x01"); - } else if (strcmp(simSlot, "1") == 0) { + mDevice->halSetParameters("g_call_sim_slot=0x01"); + } else if (strcmp(simSlot2, "1") == 0) { // SIM2 - mDevice->halSetParameters("call_state=2;g_call_state=2;g_call_sim_slot=0x02"); - } else if (strcmp(simSlot, "-1") == 0) { - // No call - mDevice->halSetParameters("call_state=1;g_call_state=1"); + mDevice->halSetParameters("g_call_sim_slot=0x02"); } // INVALID, CURRENT, CNT, MAX are reserved for internal use. diff --git a/common.mk b/common.mk index d96d8c6..4205844 100644 --- a/common.mk +++ b/common.mk @@ -493,7 +493,14 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.radio@1.5.vendor \ android.hardware.radio.config@1.2.vendor \ + android.hardware.radio.config-V1-ndk.vendor:64 \ + android.hardware.radio.data-V1-ndk.vendor:64 \ android.hardware.radio.deprecated@1.0.vendor \ + android.hardware.radio.messaging-V1-ndk.vendor:64 \ + android.hardware.radio.modem-V1-ndk.vendor:64 \ + android.hardware.radio.network-V1-ndk.vendor:64 \ + android.hardware.radio.sim-V1-ndk.vendor:64 \ + android.hardware.radio.voice-V1-ndk.vendor:64 \ android.hardware.secure_element@1.0.vendor \ libnetutils.vendor:64 \ librilutils \ diff --git a/extract-files.sh b/extract-files.sh index f061411..f321485 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -25,11 +25,11 @@ function blob_fixup() { vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-samsung.so) "${PATCHELF}" --replace-needed "libutils.so" "libutils-v30.so" "${2}" ;; - vendor/lib64/libsec-ril.so|vendor/lib64/libsec-ril-dsds.so) + vendor/lib64/libsec-ril.so) # Replace SlotID prop - sed -i 's/ril.dds.call.slotid/vendor.calls.slotid/g' "${2}" - # Pass an empty value to SecRil::RequestComplete in OnGetSmscAddressDone - xxd -p -c0 "${2}" | sed "s/600e40f9820c805224008052e10315aae30314aa/600e40f9820c805224008052e10315aa030080d2/g" | xxd -r -p > "${2}".patched + sed -i 's/ril.dds.call.ongoing/vendor.calls.slot_id/g' "${2}" + # Pass an empty value to SecRil::RequestComplete in OnGetSmscAddressDone (mov x3,x20 -> mov,x3,#0x0) + xxd -p -c0 "${2}" | sed "s/600e40f9820c805224008052e10315aa080040f9e30314aa/600e40f9820c805224008052e10315aa080040f9030080d2/g" | xxd -r -p > "${2}".patched mv "${2}".patched "${2}" ;; vendor/lib64/hw/gatekeeper.mdfpp.so|vendor/lib64/libskeymaster4device.so) diff --git a/proprietary-files.txt b/proprietary-files.txt index c67b4b0..b2bf229 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -510,107 +510,108 @@ system_ext/lib64/vendor.qti.hardware.qdutils_disp@1.0.so vendor/lib/vendor.qti.hardware.qdutils_disp@1.0.so vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so -# Qualcomm MSM Interface - From a71naxx-user 11 RP1A.200720.012 A715FXXS8BVC2 release-keys -vendor/bin/irsc_util|c2cb91666e88000df258730cd4a0a81a207a2704 -vendor/bin/pd-mapper|a480cbd53aa5042a71b3a58cf87b5e9e556f6eea -vendor/etc/init/init.qti.qcv.rc|c0c97f5674e24307440da1e166dc405ac1694d55 -vendor/etc/init/vendor.qti.rmt_storage.rc|bc212c6353c2ded44ae4d759605fbbe55aa4fa3f -vendor/etc/init/vendor.qti.tftp.rc|b27f188cbffba470a4510d50e46ff7c8446c22cb -vendor/lib/libdiag.so|154d0bbf574747f3f9a5d385d34d8d9609704d4d -vendor/lib/libdsutils.so|30c68091518f09c6f9feb56ecb3bf842435895f3 -vendor/lib/libidl.so|766a221129a8e5558ec13d8fb1cdc4577f7b10ba -vendor/lib/libqdi.so|65656b0faa17fc44d8f79dd2d589d9b85ba66bc6 -vendor/lib/libqdp.so|0baaebc560f189e968d3c814f86e40413f03f9ce -vendor/lib/libqmi.so|edaf651043a61d37f913ccc045609b4143a5a249 -vendor/lib/libqmi_cci.so|8592f991e4d5219b6128fffdbd56eeb8277e198e -vendor/lib/libqmi_client_helper.so|57aeb8bc80a3723f554803bd0657ce629e41fc9b -vendor/lib/libqmi_client_qmux.so|ab03e2c7c7df174d806381982fb5aaa9c667db47 -vendor/lib/libqmi_common_so.so|debcc5644bd7b459f98b3e743db694938c791b1a -vendor/lib/libqmi_csi.so|f65cbe21c2a8d8e1d375aeacadb1f31d2818497f -vendor/lib/libqmi_encdec.so|42f1d3da38170a5a69edaeb459db8425f455c625 -vendor/lib/libqmiservices.so|97e8634aafcddc9520b788694dff0e6499ec2d00 -vendor/lib64/libdiag.so|19f7eca9b391da618e817d11960fb8c3c71750ca -vendor/lib64/libdsutils.so|31ad5663d860d8a4c7d07787f7e2e711b4cfb162 -vendor/lib64/libidl.so|485534cc8019d0a07b89b997fbf2eb88db29190f -vendor/lib64/libqdi.so|86af4bd9660c481a4c8d33ea9186c6ebdb94dc09 -vendor/lib64/libqdp.so|c4019f71b2e598760b938998b456882738c7e51a -vendor/lib64/libqmi.so|fb336ac396e603b22e25d1ed49607f9f5421a110 -vendor/lib64/libqmi_cci.so|8b920d7258fb7fe28b51b090c56eba4d237fa7b2 -vendor/lib64/libqmi_client_helper.so|a7519124068a5eaf4ee977d1dc50122f8a927dac -vendor/lib64/libqmi_client_qmux.so|8e466991b103fd120da90d5104bbcc86db2f2541 -vendor/lib64/libqmi_common_so.so|13364998f37a22ed9b526af9afe899ba27ea8150 -vendor/lib64/libqmi_csi.so|28b7dd8906c028af98500bbab2e912d16fab455f -vendor/lib64/libqmi_encdec.so|acfff1a63cbf216f7349e55668bef9d4eb2e1f00 -vendor/lib64/libqmiservices.so|33b70e96e031e646758e5d887f1c9d6792e990ab +# Qualcomm MSM Interface +vendor/bin/irsc_util +vendor/bin/pd-mapper +vendor/etc/init/init.qti.qcv.rc +vendor/etc/init/vendor.qti.rmt_storage.rc +vendor/etc/init/vendor.qti.tftp.rc +vendor/lib/libdiag.so +vendor/lib/libdsutils.so +vendor/lib/libidl.so +vendor/lib/libqdi.so +vendor/lib/libqdp.so +vendor/lib/libqmi.so +vendor/lib/libqmi_cci.so +vendor/lib/libqmi_client_helper.so +vendor/lib/libqmi_client_qmux.so +vendor/lib/libqmi_common_so.so +vendor/lib/libqmi_csi.so +vendor/lib/libqmi_encdec.so +vendor/lib/libqmiservices.so +vendor/lib64/libdiag.so +vendor/lib64/libdsutils.so +vendor/lib64/libidl.so +vendor/lib64/libqdi.so +vendor/lib64/libqdp.so +vendor/lib64/libqmi.so +vendor/lib64/libqmi_cci.so +vendor/lib64/libqmi_client_helper.so +vendor/lib64/libqmi_client_qmux.so +vendor/lib64/libqmi_common_so.so +vendor/lib64/libqmi_csi.so +vendor/lib64/libqmi_encdec.so +vendor/lib64/libqmiservices.so +vendor/lib64/libqmiservices-ext.so +vendor/lib64/libqmiservices-sem-ext.so -# Radio - From a71naxx-user 11 RP1A.200720.012 A715FXXS8BVC2 release-keys -vendor/bin/hw/rild|72c84e72636177fd669be36a6eb8eda63fe270b0 -vendor/bin/ATFWD-daemon|39c664576dc2a278ce58809608e08a159cb7f2d5 -vendor/bin/netmgrd|5065374ebcea46cb2cff5622e928b959490454b8 -vendor/bin/qrtr-cfg|9786455690d4b8e60681f40ebe61fc937d2cd713 -vendor/bin/qrtr-lookup|6342b6b636327c53258d0d54c9dd93e34a3da3f7 -vendor/bin/qrtr-ns|09cff0de46c5d4eb1cd7dfa5b5bdda015e9d7a75 -vendor/bin/rmt_storage|3e5e2972ccc5eef280c2179555926bc5de8e28ca -vendor/bin/tftp_server|3fae2fee301ce4f0baf6dd26a033c1660164b948 -vendor/etc/data/dsi_config.xml|3658eb99e9601bc09e0b372c9290060f708fd50a -vendor/etc/data/netmgr_config.xml|dcfaffb953ec43e823f054318c8885c870fbfbbf -vendor/etc/init/netmgrd.rc|a80c77e47db9b1ad3f7444d8954de7503528ccc1 -vendor/etc/locale/plmn_delta_eng.bin|e6d4443e759c187d77bf76a5faf7447c0593cc67 -vendor/etc/locale/plmn_delta_zh-rCN.bin|deaa37a07e87f25b7b3c8e1ec0b772599dc118eb -vendor/etc/locale/plmn_delta_zh-rHK.bin|ef06b6c7c55d63993f18cc6761ac9b64acac0cce -vendor/etc/locale/plmn_delta_zh-rTW.bin|115dd09ac0703ab5bf79a73ecac5e7c6f5714b88 -vendor/etc/mtu-conf.xml|d1cb340ff63ed13252dbcd71c27e56a8f677642e -vendor/etc/plmn_delta.bin|6a826cb6a8a1d460403ab2ebccf4f0d7be546ce6 -vendor/etc/plmn_delta_attaio.bin|751a1c7105f1c03fc196689c2a71e2c69aa14e1f -vendor/etc/plmn_delta_hktw.bin|4602b2e5c84d6cd4d6836a94784987a76e7830ce -vendor/etc/plmn_delta_usagsm.bin|9a25ec9e9da16ed2f8a9db07f037fe08283b24e5 -vendor/etc/plmn_se13.bin|ca726d522e75b6ef9f65734a8ed087ab749ca6a9 -vendor/lib/libconfigdb.so|c8e29be69b88a69f622fc7ae2e3d6b8a1670abff -vendor/lib/libdsi_netctrl.so|0a12a051341abe0ea23f131882c5b31f6fbf37b5 -vendor/lib/libmdmdetect.so|31b458e0d407dd774caba8bf01a687e655d3782d -vendor/lib/libnetmgr.so|6ea82009bc07dc482fcea4c0689b25ac5b48680d -vendor/lib/libnetmgr_common.so|6effe4b1c1a93975089ff12485c29453cf4c4710 -vendor/lib/libpdnotifier.so|a79778bb88ca18dc5580d832d8e8b5c626c860e3 -vendor/lib/libqcmaputils.so|c08a9bb6577afb738f0087e571d09035474fe528 -vendor/lib/libqrtr.so|545d74fb62d03ecf834d9374e95620598d38ee3b -vendor/lib/libqsocket.so|c4cbaa2f1137630798f8a32ef03265b4f48893a3 --vendor/lib/libril.so|20ab487f3b02aefcb53f232279ebcd33bcb8aeda -vendor/lib/librilqmiservices-ext.so|df2786ee73825d757bb1944cb80319f00ffaa318 -vendor/lib/libsec_semRil.so|d418710e03484c509e516e398665f0a1c126c615 -vendor/lib/libsecril-client.so|fd7635714f4b79a912b3081514ab7928593982ea -vendor/lib/libxml.so|6ab4b027260a9091012961a98e07db25c0179afc -vendor/lib/vendor.qti.hardware.data.connection@1.0.so|d13ea70f9ee995c0bd18e4e8ab559463839374fb -vendor/lib/vendor.qti.hardware.data.connection@1.1.so|fa4670878b0cfc5b47d6b621f6257a64ab1afc7b -vendor/lib/vendor.samsung.hardware.radio.bridge@2.0.so|388428557404294b5e6b801765a9e76b86c94dd0 -vendor/lib/vendor.samsung.hardware.radio@2.0.so|35c4b6d2a20592131037bee41533144e19e14903 -vendor/lib/vendor.samsung.hardware.radio@2.1.so|8e004925bc4385221fd6afd18cef255f36151f59 -vendor/lib64/libconfigdb.so|a8596bcbb19b41ed9af8afe7dc5f24a287c4c631 -vendor/lib64/libdsi_netctrl.so|2f7fa39ee0afbfd8edbc6652bc9c2f7550273f1c -vendor/lib64/libengmode_client.so|645afdd20983065f09a333cf43d739af982fdbc0 -vendor/lib64/liblqe.so|10d10c1fd093531f65b903a588b78eefa0c99317 -vendor/lib64/libmdmdetect.so|7d9594eaa6da36b1cf7a7f9ca9447c568dcb2f38 -vendor/lib64/libnetmgr.so|ecb5d46bcdef459f09843f8ec78c9eee6fb39f97 -vendor/lib64/libnetmgr_common.so|7f744ae121cd386427924d38a8ab5ca3eca94d80 -vendor/lib64/libnlnetmgr.so|86f78e93fc4d38f14462de01cc52f4fe6f4faa68 -vendor/lib64/libpdnotifier.so|2e49a7104252a0f0fae7441cc3e291a3467c799f -vendor/lib64/libqcmaputils.so|615da2a5fe509569d27f59269f433e99982c10ed -vendor/lib64/libqrtr.so|6f7abe88e19e44f6b933de1cac0c7a3437318f04 -vendor/lib64/libqsocket.so|391748e46f7dbbf267dbc5a5c89f0d2a8b4fca4e --vendor/lib64/libril.so|58d4402730fa3be354b38e1e61ee174ee3daecce -vendor/lib64/librilqmiservices-ext.so|5d304da8bb7ce23be0cb1eaba8c4fdc87546fd18 -vendor/lib64/libsec-ril-dsds.so|79e1bdc9f45261ea2f7e118ebe5424ccc567cf19 -vendor/lib64/libsec-ril.so|c2c24dae6677b8c2e0fc22b47a8f23b27b1aba38 -vendor/lib64/libsec_semRil.so|36cd8dc9997351f709b138bfe952acaae7704bc8 -vendor/lib64/libsecril-client.so|73978f39bb8ab4d80bb2aa7747c129ae8b262aa2 -vendor/lib64/libvkmanager_vendor.so|e50eaf44eeb61bcd1501f6b6319d794b1b2cac40 -vendor/lib64/libxml.so|af2ef501c85476a675b770fd03cf24e06a9a70f6 -vendor/lib64/vendor.qti.hardware.data.connection@1.0.so|0ee3a6225b025bd53b53c60b0796c50b4bbf73c2 -vendor/lib64/vendor.qti.hardware.data.connection@1.1.so|51a2ad391a943de8cf9f62b46f9d3e1c05093cd4 -vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so|c6dd375aba54c664e61cf1915477feb01154333f -vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so|3d484397b5903450e881243314a59f5513a903e4 -vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so|ce8bc0b7ed05cbeb562a728e19be56d28ea23891 -vendor/lib64/vendor.samsung.hardware.radio@2.0.so|6a966ec2458c28c755cbd80a2bfef57d425cf743 -vendor/lib64/vendor.samsung.hardware.radio@2.1.so|11f0376e71cc60fe3e4f041cf31aba297f65daa9 +# Radio +lib/libnetutils.so:vendor/lib/libnetutils.so +lib64/libnetutils.so:vendor/lib64/libnetutils.so +vendor/bin/hw/rild +vendor/bin/adpl +vendor/bin/netmgrd +vendor/bin/qrtr-cfg +vendor/bin/qrtr-lookup +vendor/bin/qrtr-ns +vendor/bin/rmt_storage +vendor/bin/tftp_server +vendor/etc/data/dsi_config.xml +vendor/etc/data/netmgr_config.xml +vendor/etc/init/dataadpl.rc +vendor/etc/init/netmgrd.rc +vendor/etc/locale/plmn_delta_zh-rCN.bin +vendor/etc/locale/plmn_delta_zh-rHK.bin +vendor/etc/locale/plmn_delta_zh-rTW.bin +vendor/etc/mtu-conf.xml +vendor/etc/plmn_delta.bin +vendor/etc/plmn_delta_attaio.bin +vendor/etc/plmn_delta_hktw.bin +vendor/etc/plmn_delta_usagsm.bin +vendor/etc/plmn_se13.bin +vendor/lib/libconfigdb.so +vendor/lib/libdsi_netctrl.so +vendor/lib/libmdmdetect.so +vendor/lib/libnetmgr.so +vendor/lib/libnetmgr_common.so +vendor/lib/libpdnotifier.so +vendor/lib/libqcmaputils.so +vendor/lib/libqrtr.so +vendor/lib/libqsocket.so +vendor/lib/librmnetctl.so +vendor/lib/libsec_semRil.so +vendor/lib/libsecril-client.so +vendor/lib/libxml.so +vendor/lib/vendor.qti.hardware.data.connection@1.0.so +vendor/lib/vendor.qti.hardware.data.connection@1.1.so +vendor/lib64/libconfigdb.so +vendor/lib64/libdsi_netctrl.so +vendor/lib64/libengmode_client.so +vendor/lib64/libmdmdetect.so +vendor/lib64/libnetmgr.so +vendor/lib64/libnetmgr_common.so +vendor/lib64/libnlnetmgr.so +vendor/lib64/libpdnotifier.so +vendor/lib64/libqcmaputils.so +vendor/lib64/libqrtr.so +vendor/lib64/libqsocket.so +vendor/lib64/librmnetctl.so +vendor/lib64/libril_sem.so +vendor/lib64/libsec-ril.so|2618eee828deb9fba921f2d2d48989e572318c8c +vendor/lib64/libsec_semRil.so +vendor/lib64/libSemDataProps.so +vendor/lib64/libSemTelephonyProps.so +vendor/lib64/libsecril-client.so +vendor/lib64/libvkmanager_vendor.so +vendor/lib64/libxml.so +vendor/lib64/vendor.qti.hardware.data.connection@1.0.so +vendor/lib64/vendor.qti.hardware.data.connection@1.1.so +vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so +vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so +vendor/lib64/vendor.samsung.hardware.radio.channel@2.0.so +vendor/lib64/vendor.samsung.hardware.radio@2.0.so +vendor/lib64/vendor.samsung.hardware.radio@2.1.so +vendor/lib64/vendor.samsung.hardware.radio@2.2.so # SCVE vendor/lib/libscveCommon.so diff --git a/rootdir/vendor/etc/init/init.vendor.rilchip.rc b/rootdir/vendor/etc/init/init.vendor.rilchip.rc index 51b0cb8..3c6481f 100755 --- a/rootdir/vendor/etc/init/init.vendor.rilchip.rc +++ b/rootdir/vendor/etc/init/init.vendor.rilchip.rc @@ -11,12 +11,6 @@ service ril-daemon /vendor/bin/hw/rild capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW SYS_ADMIN CHOWN SYS_TIME socket sap_uim_socket1 stream 660 bluetooth bluetooth -service ril-daemon1 /vendor/bin/hw/rild -c 2 - class main - user radio - group radio cache inet misc audio log oem_2901 system drmrpc vpn readproc wakelock net_admin - capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW SYS_ADMIN CHOWN SYS_TIME - # QMUX must be in multiple groups to support external process connections service qmuxd /vendor/bin/qmuxd class main @@ -32,6 +26,9 @@ service irsc_util_oem /vendor/bin/irsc_util "/vendor/etc/sec_config_oem" service vendor.ril-daemon /vendor/bin/hw/rild-dummy override +service vendor.ril-daemon1 /vendor/bin/hw/rild-dummy + override + service vendor.ril-daemon2 /vendor/bin/hw/rild-dummy override @@ -44,4 +41,13 @@ service vendor.embmsslServer /vendor/bin/embmsslServer override on property:init.svc.vendor.netmgrd=running && property:ro.vendor.use_data_netmgrd=false - stop vendor.netmgrd \ No newline at end of file + stop vendor.netmgrd + +# To enable QMS logs +on post-fs-data + mkdir /data/vendor/qms_logs 0775 radio system + mkdir /data/vendor/qms_logs/main 0775 radio system + mkdir /data/vendor/qms_logs/other 0775 radio system + mkdir /data/vendor/qms_logs/config 0775 radio system + copy /vendor/etc/qms_log_config /data/vendor/qms_logs/config/qms_log_config + chmod 0666 /data/vendor/qms_logs/config/qms_log_config diff --git a/rootdir/vendor/etc/init/init.vendor.rilcommon.rc b/rootdir/vendor/etc/init/init.vendor.rilcommon.rc index 3fe8748..f290840 100755 --- a/rootdir/vendor/etc/init/init.vendor.rilcommon.rc +++ b/rootdir/vendor/etc/init/init.vendor.rilcommon.rc @@ -10,10 +10,7 @@ on post-fs-data mkdir /data/vendor/secradio 0770 radio radio -on property:ro.vendor.multisim.simslotcount=1 - stop ril-daemon1 - -on property:vts.native_server.on=* +on property:vts.native_server.on=* setprop vendor.vts.native_server.on ${vts.native_server.on} service network_config /vendor/bin/secril_config_svc NetworkConfig @@ -29,7 +26,10 @@ service sim_config /vendor/bin/secril_config_svc SimConfig disabled on fs + chown radio radio /mnt/vendor/efs/factory.prop + chmod 0600 /mnt/vendor/efs/factory.prop exec_start sim_config on post-fs-data exec_start network_config + setprop ro.telephony.default_network ${ro.vendor.radio.default_network} diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 0ab4baf..554a4b7 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -186,6 +186,7 @@ /(vendor|system/vendor)/bin/hw/android\.hardware\.usb-service\.samsung u:object_r:hal_usb_default_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.vibrator\-service\.samsung u:object_r:hal_vibrator_default_exec:s0 /(vendor|system/vendor)/bin/hw/macloader u:object_r:macloader_exec:s0 +/(vendor|system/vendor)/bin/hw/sehradiomanager u:object_r:sehradiomanager_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.fastcharge@1\.0-service\.samsung u:object_r:hal_lineage_fastcharge_default_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.livedisplay@2\.0-service.samsung-qcom\.sm6150 u:object_r:hal_lineage_livedisplay_sysfs_exec:s0 /(vendor|system/vendor)/bin/hw/vendor\.lineage\.touch\@[0-9]\.[0-9]-service.sm6150 u:object_r:hal_lineage_touch_default_exec:s0 diff --git a/sepolicy/vendor/sehradiomanager.te b/sepolicy/vendor/sehradiomanager.te new file mode 100644 index 0000000..c503ce1 --- /dev/null +++ b/sepolicy/vendor/sehradiomanager.te @@ -0,0 +1,13 @@ +# sehradiomanager.te + +type sehradiomanager, domain; +type sehradiomanager_exec, exec_type, file_type, vendor_file_type; + +init_daemon_domain(sehradiomanager) + +get_prop(sehradiomanager, vendor_radio_prop) +get_prop(sehradiomanager, hwservicemanager_prop) +binder_call(sehradiomanager, hwservicemanager) +binder_call(sehradiomanager, servicemanager) +binder_call(servicemanager, sehradiomanager) +hal_client_domain(sehradiomanager, hal_telephony) diff --git a/sepolicy/vendor/service_contexts b/sepolicy/vendor/service_contexts index e69de29..94cdb35 100644 --- a/sepolicy/vendor/service_contexts +++ b/sepolicy/vendor/service_contexts @@ -0,0 +1,14 @@ +vendor.samsung.hardware.radio.bridge.ISehRadioBridge/slot1 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.bridge.ISehRadioBridge/slot2 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.channel.ISehRadioChannel/epdgd u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.channel.ISehRadioChannel/epdgd2 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.channel.ISehRadioChannel/imsd u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.channel.ISehRadioChannel/imsd2 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.data.ISehRadioData/slot1 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.data.ISehRadioData/slot2 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.messaging.ISehRadioMessaging/slot1 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.messaging.ISehRadioMessaging/slot2 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.network.ISehRadioNetwork/slot1 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.network.ISehRadioNetwork/slot2 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.sim.ISehRadioSim/slot1 u:object_r:hal_radio_service:s0 +vendor.samsung.hardware.radio.sim.ISehRadioSim/slot2 u:object_r:hal_radio_service:s0 diff --git a/vendor.prop b/vendor.prop index 4d64dea..ddf05df 100644 --- a/vendor.prop +++ b/vendor.prop @@ -245,7 +245,6 @@ ro.vendor.sec.radio.def_network=9 ro.vendor.use_data_netmgrd=false telephony.lteOnCdmaDevice=1 vendor.sec.rild.libpath=/vendor/lib64/libsec-ril.so -vendor.sec.rild.libpath2=/vendor/lib64/libsec-ril-dsds.so # USB vendor.usb.controller=a600000.dwc3