From b279316b289bf61ea6dd37369eb7812648f9cbbb Mon Sep 17 00:00:00 2001 From: David Wronek Date: Sat, 28 Dec 2024 09:28:28 +0100 Subject: [PATCH] e3q: Fix data and calling Change-Id: Ib7468edf98f0daad5fd4ed026a525fd7b1b74f69 --- BoardConfig.mk | 2 +- configs/ril/sehradiomanager.conf | 2 - device.mk | 28 +- extract-files.py | 2 + .../apps/CarrierConfig/res/xml/values.xml | 2631 +++++++++++++++++ proprietary-files.txt | 58 +- vendor.prop | 4 +- 7 files changed, 2713 insertions(+), 14 deletions(-) delete mode 100644 configs/ril/sehradiomanager.conf create mode 100644 overlay/packages/apps/CarrierConfig/res/xml/values.xml diff --git a/BoardConfig.mk b/BoardConfig.mk index ca1cef3..3ff49ae 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -208,7 +208,7 @@ TARGET_VENDOR_DLKM_PROP += $(DEVICE_PATH)/vendor_dlkm.prop # RIL ENABLE_VENDOR_RIL_SERVICE := true -# TODO: SOONG_CONFIG_rfs_mpss_firmware_symlink_target := firmware_modem +SOONG_CONFIG_rfs_mpss_firmware_symlink_target := firmware_modem # Recovery TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.qcom diff --git a/configs/ril/sehradiomanager.conf b/configs/ril/sehradiomanager.conf deleted file mode 100644 index a5f5da7..0000000 --- a/configs/ril/sehradiomanager.conf +++ /dev/null @@ -1,2 +0,0 @@ -FW_READY=1 -CA_ENABLED=1 diff --git a/device.mk b/device.mk index ce0d334..bb32ef4 100644 --- a/device.mk +++ b/device.mk @@ -4,6 +4,9 @@ # SPDX-License-Identifier: Apache-2.0 # +# Add common symlinks definitions for Qualcomm Samsung +$(call inherit-product, hardware/samsung/symlinks/qcom-common.mk) + # Enable project quotas and casefolding for emulated storage without sdcardfs $(call inherit-product, $(SRC_TARGET_DIR)/product/emulated_storage.mk) @@ -116,6 +119,12 @@ PRODUCT_PACKAGES += \ libhidltransport.vendor \ libhwbinder.vendor +# IPACM +PRODUCT_PACKAGES += \ + ipacm \ + IPACM_cfg.xml \ + IPACM_Filter_cfg.xml + # Media PRODUCT_PACKAGES += \ libavservices_minijail.vendor @@ -148,12 +157,10 @@ PRODUCT_PACKAGES += \ # RIL PRODUCT_PACKAGES += \ + librilutils \ libnetutils.vendor \ libsecril-client \ - secril_config_svc \ - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/ril/sehradiomanager.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sehradiomanager.conf + secril_config_svc # Rootdir PRODUCT_PACKAGES += \ @@ -214,6 +221,19 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.qcom +#PRODUCT_COPY_FILES += \ +# $(LOCAL_PATH)/configs/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \ + frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ + frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \ + frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml \ + frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \ + frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ + frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml + # Soong namespaces PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) \ diff --git a/extract-files.py b/extract-files.py index 7df1f5c..5d21255 100755 --- a/extract-files.py +++ b/extract-files.py @@ -57,6 +57,8 @@ blob_fixups: blob_fixups_user_type = { .replace_needed('libcrypto.so', 'libcrypto-v33.so'), 'vendor/etc/seccomp_policy/atfwd@2.0.policy': blob_fixup() .add_line_if_missing('gettid: 1'), + 'vendor/lib64/libsec-ril.so': blob_fixup() + .binary_regex_replace(b'ril.dds.call.ongoing', b'vendor.calls.slot_id'), } # fmt: skip module = ExtractUtilsModule( diff --git a/overlay/packages/apps/CarrierConfig/res/xml/values.xml b/overlay/packages/apps/CarrierConfig/res/xml/values.xml new file mode 100644 index 0000000..9e01e27 --- /dev/null +++ b/overlay/packages/apps/CarrierConfig/res/xml/values.xml @@ -0,0 +1,2631 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + com.example.android.locationattribution + + + + + + + + + + + connected_mmwave:5GUWB,connected:5g,not_restricted:None,restricted:None + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + China Mobile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + China Unicom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + China Mobile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + China Unicom + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + China Unicom + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + IPV4V6 + IPV4V6 + + + + + + + + + + + + + + + + + + + + + + + China Broadcasting + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proprietary-files.txt b/proprietary-files.txt index fbbd483..6f92468 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -150,7 +150,29 @@ vendor/lib64/libmdsprpc.so vendor/lib64/libsdsprpc.so # CNE +vendor/etc/cne/mwqem.conf +vendor/etc/cne/profileMwqem.xml +vendor/etc/default-permissions/com.qualcomm.qti.cne.xml vendor/lib64/libshsc.so +vendor/lib64/vendor.qti.data.mwqem@1.0.so +vendor/lib64/vendor.qti.data.slm@1.0.so +vendor/lib64/vendor.qti.hardware.cacert@1.0.so +vendor/lib64/vendor.qti.hardware.data.cne.internal.constants@1.0.so +vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.0.so +vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.1.so +vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.2.so +vendor/lib64/vendor.qti.hardware.data.cne.internal.server@1.3.so +vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.0.so +vendor/lib64/vendor.qti.hardware.data.dynamicdds@1.1.so +vendor/lib64/vendor.qti.hardware.data.flow@1.0.so +vendor/lib64/vendor.qti.hardware.data.flow@1.1.so +vendor/lib64/vendor.qti.hardware.data.latency@1.0.so +vendor/lib64/vendor.qti.hardware.data.lce@1.0.so +vendor/lib64/vendor.qti.hardware.mwqemadapter@1.0.so +vendor/lib64/vendor.qti.hardware.slmadapter@1.0.so +vendor/lib64/vendor.qti.latency@2.0.so +vendor/lib64/vendor.qti.latency@2.1.so +vendor/lib64/vendor.qti.latency@2.2.so # Configstore vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service @@ -197,6 +219,7 @@ vendor/firmware/evass.mdt # Data vendor/bin/ATFWD-daemon vendor/bin/adpl +vendor/bin/diag_mdlog vendor/bin/qti vendor/bin/shsusrd vendor/etc/data/dsi_config.xml @@ -305,6 +328,7 @@ vendor/lib64/vendor.qti.hardware.dsp@1.0.so # DPM system_ext/etc/dpm/dpm.conf +vendor/etc/dpm_vndr/vendor.dpm.conf vendor/etc/init/dpmQmiMgr.rc vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so vendor/lib64/vendor.qti.hardware.dpmaidlservice-V1-ndk.so @@ -666,34 +690,49 @@ vendor/lib64/libqspm-mem-utils-vendor.so vendor/lib64/vendor.qti.qspmhal-V1-ndk.so # QMI +vendor/bin/init.qti.write.sh +vendor/bin/qcom-system-daemon +vendor/bin/qrtr-cfg +vendor/bin/qrtr-lookup +vendor/bin/qrtr-ns +vendor/etc/init/qmipriod.debug.rc +vendor/etc/init/qmipriod.rc +vendor/etc/seccomp_policy/qti-systemd.policy +vendor/lib64/libdiagjni.so vendor/lib64/libidl.so +vendor/lib64/libqcci_legacy.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_csvt_srvc.so vendor/lib64/libqmi_encdec.so +vendor/lib64/libqmi_legacy.so vendor/lib64/libqmiservices.so vendor/lib64/libqrtr.so -vendor/lib64/libqsh.so +vendor/lib64/libsmemlog.so +vendor/lib64/libsubsystem_control.so +vendor/lib64/libsystem_health_mon.so # Remoteproc vendor/bin/rmt_storage -vendor/bin/ssr_setup +vendor/bin/tftp_server vendor/etc/init/vendor.qti.rmt_storage.rc vendor/etc/init/vendor.qti.smp2p.rc +vendor/etc/init/vendor.qti.tftp.rc # RIL vendor/bin/hw/rild -vendor/bin/ipacm-diag vendor/bin/irsc_util vendor/bin/ks vendor/bin/qms;DISABLE_CHECKELF +vendor/bin/tlpd 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/tlpd.rc vendor/etc/init/vendor.samsung.rilchip.qcom.rc vendor/etc/init/vendor.samsung.rild.rc vendor/etc/locale/plmn_delta_eng.bin @@ -721,6 +760,11 @@ 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/libtlpd.so +vendor/lib64/libtlpd_configmgr.so +vendor/lib64/libtlpd_crypto.so +vendor/lib64/libtlpd_internal.so +vendor/lib64/libtlpd_logger.so vendor/lib64/libvkmanager_vendor.so vendor/lib64/vendor.qti.hardware.bttpi-V3-ndk.so vendor/lib64/vendor.samsung.hardware.radio-V1-ndk.so @@ -832,6 +876,7 @@ vendor/etc/sensors/config/sns_tilt_sw_enabled.json vendor/etc/sensors/hals.conf vendor/etc/sensors/sns_reg_config vendor/lib64/libnanopb.so +vendor/lib64/libqsh.so vendor/lib64/libsensorslog.so vendor/lib64/libsns_api.so vendor/lib64/libsns_device_mode_stub.so @@ -844,6 +889,11 @@ vendor/lib64/libsnsdiaglog.so vendor/lib64/libsnsutils.so vendor/lib64/libssc_default_listener.so +# SSR +vendor/bin/ssr_diag +vendor/bin/ssr_setup +vendor/bin/subsystem_ramdump + # TEE vendor/lib64/libGPMTEEC_vendor.so vendor/lib64/libGPTEE_vendor.so diff --git a/vendor.prop b/vendor.prop index 38a2135..b7f776a 100644 --- a/vendor.prop +++ b/vendor.prop @@ -3,9 +3,6 @@ ro.vendor.fingerprint.type=udfps ro.vendor.fingerprint.sensor_location=720|2327|147 ro.vendor.fingerprint.request_touch_event=true -# Radio -ro.radio.noril=no - # Audio aaudio.hw_burst_min_usec=2000 aaudio.mmap_exclusive_policy=2 @@ -193,6 +190,7 @@ vendor.power.pasr.enabled=true persist.vendor.radio.atfwd.start=true persist.vendor.radio.enableadvancedscan=true ro.radio.noril=no +ro.telephony.default_network=33,33 ro.telephony.default_cdma_sub=0 # USB