diff --git a/BoardConfig.mk b/BoardConfig.mk
index 49ec7d5..c5b4cd7 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -21,7 +21,21 @@ TARGET_CPU_VARIANT_RUNTIME := kryo300
TARGET_OTA_ASSERT_DEVICE := e3q
# Audio
-TARGET_PROVIDES_AUDIO_HAL := true
+$(call soong_config_set, android_hardware_audio, run_64bit, true)
+
+AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
+AUDIO_FEATURE_ENABLED_DTS_EAGLE := false
+AUDIO_FEATURE_ENABLED_PAL_HIDL := true
+AUDIO_FEATURE_ENABLED_AGM_HIDL := true
+AUDIO_FEATURE_ENABLED_LSM_HIDL := true
+AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
+AUDIO_FEATURE_ENABLED_DLKM := true
+AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
+AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true
+AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
+AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true
+BOARD_SUPPORTS_SOUND_TRIGGER := true
+TARGET_USES_QCOM_MM_AUDIO := true
# Board
TARGET_BOARD_INFO_FILE := $(DEVICE_PATH)/board-info.txt
@@ -43,6 +57,9 @@ BOARD_INCLUDE_DTB_IN_BOOTIMG := true
BOARD_USES_QCOM_MERGE_DTBS_SCRIPT := true
TARGET_NEEDS_DTBOIMAGE := true
+# Filesystem
+TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
+
# Init Boot
BOARD_INIT_BOOT_HEADER_VERSION := 4
BOARD_MKBOOTIMG_INIT_ARGS += --header_version $(BOARD_INIT_BOOT_HEADER_VERSION)
diff --git a/config.fs b/config.fs
new file mode 100644
index 0000000..f7f3f3c
--- /dev/null
+++ b/config.fs
@@ -0,0 +1,260 @@
+[AID_VENDOR_QTI_DIAG]
+value:2901
+
+[AID_VENDOR_QDSS]
+value:2902
+
+[AID_VENDOR_RFS]
+value:2903
+
+[AID_VENDOR_RFS_SHARED]
+value:2904
+
+[AID_VENDOR_ADPL_ODL]
+value:2905
+
+[AID_VENDOR_QRTR]
+value:2906
+
+[AID_VENDOR_THERMAL]
+value:2907
+
+[AID_VENDOR_FASTRPC]
+value:2908
+
+[AID_VENDOR_QTR]
+value:2909
+
+[AID_VENDOR_NXP_STRONGBOX]
+value:2910
+
+[AID_VENDOR_NXP_WEAVER]
+value:2911
+
+[AID_VENDOR_SSGTZD]
+value:2912
+
+[AID_VENDOR_THALES_STRONGBOX]
+value:2913
+
+[vendor/bin/hw/android.hardware.security.keymint-service.strongbox-thales]
+mode: 0755
+user: AID_VENDOR_THALES_STRONGBOX
+group: AID_SYSTEM
+caps: SYS_ADMIN SYS_NICE
+
+[vendor/bin/hw/android.hardware.security.keymint-service.strongbox]
+mode: 0755
+user: AID_VENDOR_NXP_STRONGBOX
+group: AID_SYSTEM
+caps: SYS_ADMIN SYS_NICE
+
+[vendor/bin/hw/android.hardware.weaver@1.0-service]
+mode: 0755
+user: AID_VENDOR_NXP_WEAVER
+group: AID_SYSTEM
+caps: SYS_ADMIN SYS_NICE
+
+[vendor/bin/wcnss_filter]
+mode: 0755
+user: AID_BLUETOOTH
+group: AID_BLUETOOTH
+caps: BLOCK_SUSPEND
+
+[system/vendor/bin/wcnss_filter]
+mode: 0755
+user: AID_BLUETOOTH
+group: AID_BLUETOOTH
+caps: BLOCK_SUSPEND
+
+[vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti]
+mode: 0755
+user: AID_BLUETOOTH
+group: AID_BLUETOOTH
+caps: BLOCK_SUSPEND NET_ADMIN
+
+[system/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: BLOCK_SUSPEND NET_ADMIN
+
+[vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti-lazy]
+mode: 0755
+user: AID_BLUETOOTH
+group: AID_BLUETOOTH
+caps: BLOCK_SUSPEND NET_ADMIN
+
+[system/vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti-lazy]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: BLOCK_SUSPEND NET_ADMIN
+
+[system/bin/cnss-daemon]
+mode: 0755
+user: AID_BLUETOOTH
+group: AID_BLUETOOTH
+caps: NET_BIND_SERVICE
+
+[vendor/bin/pm-service]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE
+
+[system/vendor/bin/pm-service]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE
+
+[system/bin/pm-service]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE
+
+[vendor/bin/pd-mapper]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE
+
+[system/vendor/bin/pd-mapper]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE
+
+[system/bin/pd-mapper]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE
+
+[vendor/bin/imsdatadaemon]
+mode: 0755
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE
+
+[system/vendor/bin/imsdatadaemon]
+mode: 0755
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE
+
+[vendor/bin/ims_rtp_daemon]
+mode: 0755
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE
+
+[system/vendor/bin/ims_rtp_daemon]
+mode: 0755
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE
+
+[vendor/bin/imsrcsd]
+mode: 0755
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
+
+[system/vendor/bin/imsrcsd]
+mode: 0755
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
+
+[vendor/bin/imsdaemon]
+mode: 0755
+user: AID_RADIO
+group: AID_RADIO
+caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
+
+[vendor/bin/cnd]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE BLOCK_SUSPEND NET_ADMIN
+
+[system/vendor/bin/cnd]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE BLOCK_SUSPEND NET_ADMIN
+
+[vendor/bin/slim_daemon]
+mode: 0755
+user: AID_GPS
+group: AID_GPS
+caps: NET_BIND_SERVICE
+
+[system/vendor/bin/slim_daemon]
+mode: 0755
+user: AID_GPS
+group: AID_GPS
+caps: NET_BIND_SERVICE
+
+[vendor/bin/loc_launcher]
+mode: 0755
+user: AID_GPS
+group: AID_GPS
+caps: SETUID SETGID
+
+[system/vendor/bin/loc_launcher]
+mode: 0755
+user: AID_GPS
+group: AID_GPS
+caps: SETUID SETGID
+
+[vendor/bin/xtwifi-client]
+mode: 0755
+user: AID_GPS
+group: AID_GPS
+caps: NET_BIND_SERVICE BLOCK_SUSPEND WAKE_ALARM
+
+[vendor/bin/sensors.qti]
+mode: 0755
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: NET_BIND_SERVICE
+
+[firmware/]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
+[firmware/image/*]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
+[vendor/firmware_mnt/image/*]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
+[bt_firmware/]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
+[persist/]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
+[dsp/]
+mode: 0771
+user: AID_MEDIA
+group: AID_MEDIA
+caps: 0
diff --git a/device.mk b/device.mk
index cbf7066..3cb5f37 100644
--- a/device.mk
+++ b/device.mk
@@ -28,22 +28,28 @@ BOARD_SHIPPING_API_LEVEL := 34
PRODUCT_SHIPPING_API_LEVEL := $(BOARD_SHIPPING_API_LEVEL)
# Audio
+SOONG_CONFIG_NAMESPACES += android_hardware_audio
+SOONG_CONFIG_android_hardware_audio += \
+ run_64bit
+SOONG_CONFIG_android_hardware_audio_run_64bit := true
+
PRODUCT_PACKAGES += \
android.hardware.audio@7.1-impl \
+ android.hardware.audio.common-V1-ndk.vendor \
android.hardware.audio.effect@7.0-impl \
android.hardware.audio.service \
android.hardware.bluetooth.audio-impl \
android.hardware.soundtrigger@2.3-impl \
audio.bluetooth.default \
+ audio.primary.pineapple \
audio.r_submix.default \
audio.usb.default \
audioadsprpcd \
+ libagmmixer \
libagm_compress_plugin \
libagm_mixer_plugin \
libagm_pcm_plugin \
libbatterylistener \
- libfmpal \
- libhfp_pal \
libqcompostprocbundle \
libqcomvisualizer \
libqcomvoiceprocessing \
@@ -52,8 +58,21 @@ PRODUCT_PACKAGES += \
libvolumelistener
AUDIO_HAL_DIR := hardware/qcom-caf/sm8650/audio/primary-hal
+AUDIO_PAL_DIR := hardware/qcom-caf/sm8650/audio/pal
-# Bluetooth
+PRODUCT_COPY_FILES += \
+ $(AUDIO_HAL_DIR)/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.conf \
+ $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.xml \
+ $(AUDIO_HAL_DIR)/configs/pineapple/microphone_characteristics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/microphone_characteristics.xml \
+ $(AUDIO_PAL_DIR)/configs/pineapple/Hapticsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/Hapticsconfig.xml \
+
+PRODUCT_COPY_FILES += \
+ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
+ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \
+ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \
+ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
# Boot animation
TARGET_SCREEN_HEIGHT := 3120
@@ -109,6 +128,10 @@ PRODUCT_PACKAGES += \
# Overlays
PRODUCT_ENFORCE_RRO_TARGETS := *
+# Power
+PRODUCT_PACKAGES += \
+ android.hardware.power-service-qti
+
# Partitions
PRODUCT_USE_DYNAMIC_PARTITIONS := true
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9ed61f4..f16cc2d 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -9,8 +9,14 @@ vendor/lib64/libadsprpc.so
vendor/lib64/libloadalgo_stub.so
# Audio
-vendor/lib64/hw/audio.primary.pineapple.so
+vendor/bin/audioadsprpcd
+vendor/etc/init/vendor.qti.audio-adsprpc-service.rc
+vendor/lib64/hw/android.hardware.bluetooth.audio-impl-qti.so
+vendor/lib64/hw/audio.bluetooth_qti.default.so
+vendor/lib64/hw/sound_trigger.primary.pineapple.so
+vendor/lib64/hw/vendor.samsung.hardware.audio@1.0-impl.so
vendor/lib64/libPeripheralStateUtils.so
+vendor/lib64/libVoiceSdk.so
vendor/lib64/lib_SamsungRec_08020.so
vendor/lib64/lib_lvacfs.so
vendor/lib64/libagm.so
@@ -21,7 +27,11 @@ vendor/lib64/libar-pal.so;DISABLE_CHECKELF
vendor/lib64/libarmemlog.so
vendor/lib64/libats.so
vendor/lib64/libaudio_log_utils.so
+vendor/lib64/libbluetooth_audio_session_aidl_qti.so
+vendor/lib64/libbluetooth_audio_session_qti.so
+vendor/lib64/libbluetooth_audio_session_qti_2_1.so
vendor/lib64/libfloatingfeature.so
+vendor/lib64/liblistensoundmodel2vendor.so
vendor/lib64/liblx-ar_util.so
vendor/lib64/liblx-osal.so
vendor/lib64/librecordalive.so
@@ -29,9 +39,29 @@ vendor/lib64/libsecaudioinfo.so
vendor/lib64/libsecaudiolevel.so
vendor/lib64/libsecnativefeature.so
vendor/lib64/libspeakercalibration.so
+vendor/lib64/libtensorflowlite_c.so
vendor/lib64/libvui_intf.so
vendor/lib64/vendor.qti.hardware.AGMIPC@1.0-impl.so
+vendor/lib64/vendor.qti.hardware.ListenSoundModel@1.0-impl.so
+vendor/lib64/vendor.qti.hardware.ListenSoundModel@1.0.so
vendor/lib64/vendor.qti.hardware.pal@1.0-impl.so
+vendor/lib64/vendor.samsung.hardware.audio@1.0.so
+
+# Audio XML
+vendor/etc/audio/sku_pineapple_qssi/audio_policy_configuration.xml
+vendor/etc/audio_policy_configuration.xml
+vendor/etc/audio_policy_configuration_base.xml
+vendor/etc/audio_policy_volumes.xml
+vendor/etc/bluetooth_audio_policy_configuration.xml
+vendor/etc/bluetooth_qti_audio_policy_configuration.xml
+vendor/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml
+vendor/etc/card-defs.xml
+vendor/etc/default_volume_tables.xml
+vendor/etc/hearing_aid_audio_policy_configuration.xml
+vendor/etc/mem_logger_config.xml
+vendor/etc/r_submix_audio_policy_configuration.xml
+vendor/etc/situation_audio_policy_volumes_sec.xml
+vendor/etc/usb_audio_policy_configuration.xml
# Camera firmware
vendor/firmware/CAMERA_ICP.b00
@@ -84,7 +114,6 @@ vendor/etc/init/ssgtzd.rc
vendor/etc/seccomp_policy/qwesd@2.0.policy
vendor/etc/ssg/ta_config.json
vendor/etc/ssg/tz_whitelist.json
-vendor/etc/ssg/tz_whitelist.json
vendor/lib64/libtaautoload.so
# CVP
@@ -207,7 +236,6 @@ vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_cmd_mode_dsi_visionox_panel_w
vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_qsync_cmd_mode_dsi_visionox_panel_with_DSC.json
vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_qsync_video_mode_dsi_visionox_panel_with_DSC.json
vendor/etc/display/qdcm_calib_data_vtdr6130_amoled_video_mode_dsi_visionox_panel_with_DSC.json
-vendor/etc/display/thermallevel_to_fps.xml
# DSP
vendor/bin/dspservice
@@ -389,6 +417,69 @@ vendor/lib64/vendor.qti.hardware.secureprocessor.common@1.0.so
vendor/lib64/vendor.qti.hardware.secureprocessor.config@1.0.so
vendor/lib64/vendor.qti.hardware.secureprocessor.device@1.0.so
+# GNSS
+vendor/bin/hw/android.hardware.gnss-aidl-service-qti
+vendor/bin/loc_launcher
+vendor/bin/lowi-server;DISABLE_CHECKELF
+vendor/bin/xtra-daemon
+vendor/etc/batching.conf
+vendor/etc/gnss_antenna_info.conf
+vendor/etc/gps.conf
+vendor/etc/init/android.hardware.gnss-aidl-service-qti.rc
+vendor/etc/init/loc-launcher.rc
+vendor/etc/init/vendor.qsap.location.rc
+vendor/etc/izat.conf
+vendor/etc/lowi.conf
+vendor/etc/sap.conf
+vendor/etc/sec_config
+vendor/etc/seccomp_policy/gnss@2.0-base.policy
+vendor/etc/seccomp_policy/gnss@2.0-edgnss-daemon.policy
+vendor/etc/seccomp_policy/gnss@2.0-qsap-location.policy
+vendor/etc/seccomp_policy/gnss@2.0-xtra-daemon.policy
+vendor/etc/seccomp_policy/gnss@2.0-xtwifi-client.policy
+vendor/etc/vintf/manifest/android.hardware.gnss-aidl-service-qti.xml
+vendor/etc/vintf/manifest/vendor.qti.gnss-service.xml
+vendor/etc/xtwifi.conf
+vendor/lib64/hw/android.hardware.gnss-aidl-impl-qti.so
+vendor/lib64/hw/vendor.samsung.hardware.gnss-aidl-impl-sec.so
+vendor/lib64/libbatching.so
+vendor/lib64/libcdfw.so
+vendor/lib64/libcdfw_remote_api.so
+vendor/lib64/libdataitems.so
+vendor/lib64/libgeofencing.so
+vendor/lib64/libgnss.so
+vendor/lib64/libgnsspps.so
+vendor/lib64/libgps.utils.so
+vendor/lib64/libizat_client_api.so
+vendor/lib64/libizat_core.so
+vendor/lib64/liblbs_core.so
+vendor/lib64/libloc_api_v02.so
+vendor/lib64/libloc_api_wds.so
+vendor/lib64/libloc_base_util.so
+vendor/lib64/libloc_core.so
+vendor/lib64/libloc_mq_client.so
+vendor/lib64/libloc_socket.so
+vendor/lib64/libloc_util.so
+vendor/lib64/liblocation_api.so
+vendor/lib64/liblocation_api_msg.so
+vendor/lib64/liblocation_client_api.so
+vendor/lib64/liblocation_integration_api.so
+vendor/lib64/liblocationservice.so
+vendor/lib64/liblocationservice_glue.so
+vendor/lib64/liblowi_client.so
+vendor/lib64/liblowi_common.so
+vendor/lib64/liblowi_wifihal.so
+vendor/lib64/libmapdata_api.so
+vendor/lib64/libpal_net_if.so
+vendor/lib64/libsemnativecarrierfeature.so
+vendor/lib64/libsynergy_loc_api.so
+vendor/lib64/libsys_info_cache.so
+vendor/lib64/libwifiobserver.so
+vendor/lib64/libxtadapter.so
+vendor/lib64/vendor.qti.gnss-V5-ndk.so
+vendor/lib64/vendor.qti.gnss-service.so
+vendor/lib64/vendor.samsung.hardware.gnss-V2-ndk_platform.so
+
# Graphics
vendor/lib64/egl/eglSubDriverAndroid.so
vendor/lib64/egl/libEGL_adreno.so;SYMLINK=vendor/lib64/libEGL_adreno.so
@@ -409,6 +500,12 @@ vendor/lib64/libllvm-glnext.so
vendor/lib64/libllvm-qcom.so
vendor/lib64/libllvm-qgl.so
+# Health
+vendor/bin/hw/vendor.samsung.hardware.health-service
+vendor/etc/init/vendor.samsung.hardware.health-service.rc
+vendor/etc/vintf/manifest/vendor.samsung.hardware.health-service.xml
+vendor/lib64/vendor.samsung.hardware.health-V1-ndk.so
+
# Hermes
vendor/bin/hermesd
vendor/bin/hw/vendor.samsung.hardware.security.hermes-service
@@ -464,19 +561,32 @@ vendor/lib64/libqti-perfd.so
vendor/lib64/libqti-util.so
vendor/lib64/vendor.qti.hardware.perf2-V1-ndk.so
+# Peripheral manager
+vendor/bin/pm-proxy
+vendor/bin/pm-service
+vendor/lib64/libperipheral_client.so
+
# PD
vendor/lib64/libpdmapper.so
vendor/lib64/libpdnotifier.so
-# Power
-vendor/bin/hw/android.hardware.power.samsung-service
-vendor/etc/vintf/manifest/power-samsung.xml
-vendor/lib64/libSamsngPowerHal.so
-
# Protobuf
vendor/lib64/libprotobuf-cpp-full-21.7.so
vendor/lib64/libprotobuf-cpp-lite-21.7.so
+# QCC
+vendor/bin/qcc-vendor
+vendor/etc/init/init.qccvendor.rc
+vendor/etc/seccomp_policy/qesdk.policy
+vendor/etc/vintf/manifest/vendor.qti.qccvndhal_aidl-service.xml
+vendor/lib64/libqcc_file_agent.so
+vendor/lib64/libqcc_sdk.so
+vendor/lib64/vendor.qti.hardware.qccsyshal@1.0.so
+vendor/lib64/vendor.qti.hardware.qccsyshal@1.1.so
+vendor/lib64/vendor.qti.hardware.qccsyshal@1.2.so
+vendor/lib64/vendor.qti.qccvndhal_aidl-V1-ndk.so
+vendor/lib64/vendor.qti.qccvndhal_aidl-halimpl.so
+
# QSEECOM
vendor/lib64/libGPreqcancel.so
vendor/lib64/libGPreqcancel_svc.so
@@ -531,10 +641,8 @@ vendor/lib64/vendor.samsung.hardware.security.sem@1.0.so
vendor/bin/hw/android.hardware.security.keymint-service
vendor/bin/hw/android.hardware.security.keymint-service-spu-qti
vendor/bin/hw/vendor.samsung.hardware.security.skpm@1.0-service
-vendor/bin/vendor.samsung.hardware.security.fkeymaster-service
vendor/etc/init/android.hardware.security.keymint-service-spu-qti.rc
vendor/etc/init/android.hardware.security.keymint-service.rc
-vendor/etc/init/vendor.samsung.hardware.security.fkeymaster-service.rc
vendor/etc/init/vendor.samsung.hardware.security.skpm@1.0-service.rc
vendor/etc/vintf/manifest/vendor.samsung.hardware.security.skpm@1.0-manifest.xml
vendor/lib64/android.hardware.keymaster-V4-ndk.so;MODULE_SUFFIX=_vendor
@@ -556,7 +664,6 @@ vendor/lib64/libspukeymint.so
vendor/lib64/libspukeymintdeviceutils.so
vendor/lib64/libspukeymintutils.so
vendor/lib64/vendor.samsung.hardware.keymint-V3-ndk.so
-vendor/lib64/vendor.samsung.hardware.security.fkeymaster-V1-ndk.so
vendor/lib64/vendor.samsung.hardware.security.skpm@1.0.so
# SMC Invoke
@@ -571,7 +678,16 @@ vendor/lib64/libsfp_teegw.so
vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so
# Thermal
+vendor/bin/hw/vendor.samsung.hardware.thermal-service
+vendor/etc/btcon.json
+vendor/etc/display/thermallevel_to_fps.xml
+vendor/etc/init/vendor.samsung.hardware.thermal-default.rc
+vendor/etc/mercury.json
+vendor/etc/mercury_hv.json
+vendor/etc/vintf/manifest/vendor.samsung.hardware.thermal-default.xml
vendor/lib64/libthermalclient.so
+vendor/lib64/service-listener-ext-aidl-V1-ndk.so
+vendor/lib64/vendor.samsung.hardware.thermal-V1-ndk.so
# Time services
vendor/app/TimeService/TimeService.apk
diff --git a/vintf/device_framework_matrix.xml b/vintf/device_framework_matrix.xml
index eff2d76..7540082 100644
--- a/vintf/device_framework_matrix.xml
+++ b/vintf/device_framework_matrix.xml
@@ -179,4 +179,20 @@
default
+
+ vendor.samsung.hardware.gnss
+ 2.0
+
+ ISehGnss
+ default
+
+
+
+ vendor.samsung.hardware.gnss
+ 2
+
+ ISehGnss
+ default
+
+