diff --git a/configs/ril/sehradiomanager.conf b/configs/ril/sehradiomanager.conf new file mode 100644 index 0000000..a5f5da7 --- /dev/null +++ b/configs/ril/sehradiomanager.conf @@ -0,0 +1,2 @@ +FW_READY=1 +CA_ENABLED=1 diff --git a/device.mk b/device.mk index d0d49a3..4b6581f 100644 --- a/device.mk +++ b/device.mk @@ -117,6 +117,9 @@ PRODUCT_PACKAGES += \ libavservices_minijail.vendor # Overlays +PRODUCT_PACKAGES += \ + FrameworksResTarget + PRODUCT_ENFORCE_RRO_TARGETS := * # Power @@ -143,7 +146,11 @@ PRODUCT_PACKAGES += \ # RIL PRODUCT_PACKAGES += \ libnetutils.vendor \ - libsecril-client + libsecril-client \ + secril_config_svc \ + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/ril/sehradiomanager.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sehradiomanager.conf # Rootdir PRODUCT_PACKAGES += \ @@ -211,6 +218,22 @@ PRODUCT_SOONG_NAMESPACES += \ kernel/samsung/sm8650 \ kernel/samsung/sm8650-modules +# Telephony +PRODUCT_PACKAGES += \ + qti-telephony-hidl-wrapper \ + qti_telephony_hidl_wrapper.xml \ + qti-telephony-utils \ + qti_telephony_utils.xml \ + telephony-ext + +PRODUCT_BOOT_JARS += \ + telephony-ext + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.samsung.hardware.telephony.gsm.xml \ + frameworks/native/data/etc/android.hardware.telephony.mbms.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.mbms.xml \ + frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml + # Thermal PRODUCT_PACKAGES += \ android.hardware.thermal@1.0.vendor diff --git a/extract-files.py b/extract-files.py index 883601f..f13ee18 100755 --- a/extract-files.py +++ b/extract-files.py @@ -55,9 +55,11 @@ lib_fixups: lib_fixups_user_type = { blob_fixups: blob_fixups_user_type = { - ('vendor/lib64/libhyper.so', 'vendor/lib64/libspukeymintdeviceutils.so', 'vendor/lib64/libcppcose_rkp.so', 'vendor/lib64/libspukeymint.so', 'vendor/lib64/libhermes.so', 'vendor/lib64/libese-grdg.so', 'vendor/lib64/libspukeymintutils.so', 'vendor/lib64/libskeymint10device.so', 'vendor/lib64/liblbs_core.so', 'vendor/lib64/liboemcrypto.so', 'vendor/lib64/libwifi-hal-qcom.so', 'vendor/lib64/libpuresoftkeymasterdevice.so', 'vendor/lib64/libpal_net_if.so', 'vendor/lib64/libsfp_sensor.so', 'vendor/lib64/libkeystore-engine-wifi-hidl.so', 'vendor/lib64/libkeymaster_portable.so', 'vendor/lib64/mediacas/libclearkeycasplugin.so', 'vendor/lib64/libqcc_sdk.so', 'vendor/lib64/libdk_vnd_service_core.so', 'vendor/lib64/libwifi-hal.so', 'vendor/lib64/libtlpd_crypto.so', 'vendor/lib64/libsec-ril.so', 'vendor/lib64/libcppbor_external.so', 'vendor/lib64/libucm_tlc_tz_esecomm.so', 'vendor/lib64/libqms.so', 'vendor/lib64/libskeymint_cli.so', 'vendor/lib64/libengmode15.so', 'vendor/lib64/libkeymaster4_1support.so', 'vendor/lib64/libizat_core.so', 'vendor/lib64/libspcom.so', 'vendor/lib64/libFaceService.so', 'vendor/lib64/uwb_uci.hal.so', 'vendor/lib64/libnicm_utils.so', 'vendor/lib64/mediadrm/libdrmclearkeyplugin.so', 'vendor/lib64/libkeymaster4support.so', 'vendor/lib64/libsdmextension.so'): blob_fixup() + ('vendor/lib64/libspukeymintdeviceutils.so', 'vendor/lib64/libspukeymint.so', 'vendor/lib64/libhermes.so', 'vendor/lib64/libspukeymintutils.so', 'vendor/lib64/libskeymint10device.so', 'vendor/lib64/liblbs_core.so', 'vendor/lib64/liboemcrypto.so', 'vendor/lib64/libpuresoftkeymasterdevice.so', 'vendor/lib64/libpal_net_if.so', 'vendor/lib64/libsfp_sensor.so', 'vendor/lib64/libkeymaster_portable.so', 'vendor/lib64/mediacas/libclearkeycasplugin.so', 'vendor/lib64/libqcc_sdk.so', 'vendor/lib64/libdk_vnd_service_core.so', 'vendor/lib64/libtlpd_crypto.so', 'vendor/lib64/libsec-ril.so', 'vendor/lib64/libcppbor_external.so', 'vendor/lib64/libucm_tlc_tz_esecomm.so', 'vendor/lib64/libqms.so', 'vendor/lib64/libskeymint_cli.so', 'vendor/lib64/libengmode15.so', 'vendor/lib64/libkeymaster4_1support.so', 'vendor/lib64/libizat_core.so', 'vendor/lib64/libspcom.so', 'vendor/lib64/libFaceService.so', 'vendor/lib64/uwb_uci.hal.so', 'vendor/lib64/libnicm_utils.so', 'vendor/lib64/mediadrm/libdrmclearkeyplugin.so', 'vendor/lib64/libkeymaster4support.so', 'vendor/lib64/libsdmextension.so'): blob_fixup() .replace_needed('libcrypto.so', 'libcrypto-v33.so') - .add_needed('android.hardware.security.rkp-V3-ndk.so') + .add_needed('android.hardware.security.rkp-V3-ndk.so'), + 'vendor/etc/seccomp_policy/atfwd@2.0.policy': blob_fixup() + .add_line_if_missing('gettid: 1'), } # fmt: skip module = ExtractUtilsModule( diff --git a/overlay/FrameworksResTarget/res/values/config.xml b/overlay/FrameworksResTarget/res/values/config.xml index a6d2d43..970ad11 100644 --- a/overlay/FrameworksResTarget/res/values/config.xml +++ b/overlay/FrameworksResTarget/res/values/config.xml @@ -5,6 +5,7 @@ true true true - true - 120 + 240 + 144 + M20 0h1040s20 0 20 20v2360s0 20 -20 20h-1040s-20 0 -20 -20v-2360s0 -20 20 -20 diff --git a/proprietary-files.txt b/proprietary-files.txt index 63b78ba..444e038 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -211,6 +211,7 @@ vendor/etc/init/dataqti.rc vendor/etc/init/init.embmssl_server.rc vendor/etc/init/shsusrd.rc vendor/etc/seccomp_policy/atfwd@2.0.policy +vendor/etc/vintf/manifest/atfwd-saidl.xml vendor/lib64/libconfigdb.so vendor/lib64/libdsi_netctrl.so vendor/lib64/libdsutils.so @@ -319,7 +320,6 @@ vendor/bin/hw/vendor.samsung.hardware.security.drk@2.0-service vendor/etc/init/vendor.samsung.hardware.security.drk-service.rc vendor/etc/vintf/manifest/drk_manifest.xml vendor/lib64/libdk_vnd_service_core.so -vendor/lib64/libvkmanager_vendor.so vendor/lib64/vendor.samsung.hardware.security.drk-V1-ndk.so vendor/lib64/vendor.samsung.hardware.security.drk@2.0.so @@ -583,7 +583,6 @@ vendor/bin/hw/vendor.samsung.hardware.security.hermes-service vendor/etc/init/hermesd.rc vendor/etc/init/vendor.samsung.hardware.security.hermes.rc vendor/etc/vintf/manifest/vendor.samsung.hardware.security.hermes.xml -vendor/lib64/libese-grdg.so vendor/lib64/libhermes.so vendor/lib64/libhermes_bdbridge.so vendor/lib64/libhermes_cred.so @@ -599,6 +598,10 @@ vendor/lib64/vendor.samsung.hardware.hyper-V2-ndk.so # Memory vendor/lib64/libvmmem.so +# NFC +vendor/etc/libnfc-nxp.conf +vendor/etc/nfc/libnfc-nxp_RF.conf + # NVM vendor/bin/sec_nvm vendor/bin/spdaemon @@ -687,27 +690,69 @@ vendor/lib64/libqsh.so vendor/bin/rmt_storage vendor/bin/ssr_setup vendor/etc/init/vendor.qti.rmt_storage.rc +vendor/etc/init/vendor.qti.smp2p.rc # RIL +vendor/bin/hw/rild +vendor/bin/ipacm-diag vendor/bin/irsc_util +vendor/bin/ks vendor/bin/qms;DISABLE_CHECKELF +vendor/bin/secril_config_svc +vendor/etc/init/init.vendor.onebinary.rc +vendor/etc/init/init.vendor.rilcommon.rc +vendor/etc/init/ipacm-diag.rc vendor/etc/init/qms.rc vendor/etc/init/vendor.samsung.rilchip.qcom.rc +vendor/etc/init/vendor.samsung.rild.rc +vendor/etc/locale/plmn_delta_eng.bin +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/pdpcnt-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/etc/qms_log_config vendor/etc/sec_config_oem vendor/etc/seccomp_policy/qms.policy +vendor/etc/vintf/manifest/qms-saidl.xml +vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml +vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_34.xml +vendor/lib64/libSemDataProps.so +vendor/lib64/libSemTelephonyProps.so +vendor/lib64/libengmode_client.so vendor/lib64/libqdpr.so +vendor/lib64/libril_sem.so +vendor/lib64/libsec-ril.so +vendor/lib64/libsec_semRil.so vendor/lib64/libsecril-client.so;MODULE_SUFFIX=_vendor +vendor/lib64/libvkmanager_vendor.so vendor/lib64/vendor.qti.hardware.bttpi-V3-ndk.so +vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so +vendor/lib64/vendor.samsung.hardware.radio.bridge-V1-ndk.so +vendor/lib64/vendor.samsung.hardware.radio.channel-V1-ndk.so +vendor/lib64/vendor.samsung.hardware.radio.data-V1-ndk.so +vendor/lib64/vendor.samsung.hardware.radio.messaging-V1-ndk.so +vendor/lib64/vendor.samsung.hardware.radio.sim-V1-ndk.so + +# RIL - UIM +product/etc/permissions/UimService.xml +product/framework/uimservicelibrary.jar # Secure element vendor/bin/hw/android.hardware.secure_element-service.nxp vendor/bin/hw/vendor.samsung.hardware.security.sem@1.0-service vendor/etc/init/secure_element-service-nxp.rc vendor/etc/init/vendor.samsung.hardware.security.sem@1.0-service.rc +vendor/etc/libese-nxp.conf vendor/etc/vintf/manifest/vendor.samsung.hardware.security.sem@1.0-manifest.xml +vendor/lib64/libese-grdg.so vendor/lib64/libsec_esek.so vendor/lib64/libsec_semHalTlc.so -vendor/lib64/libsec_semRil.so vendor/lib64/vendor.qti.esepowermanager@1.0.so vendor/lib64/vendor.samsung.hardware.security.sem@1.0.so @@ -793,6 +838,9 @@ vendor/lib64/libtime_genoff.so # USB vendor/bin/hw/android.hardware.usb-service.qti +# Ultra-wideband +vendor/etc/libuwb-nxp.conf + # Wi-Fi vendor/bin/cnss-daemon vendor/bin/cnss_diag;DISABLE_DEPS