diff --git a/BoardConfig.mk b/BoardConfig.mk index 4c19665b3b69407edb0c36306ff972e859934454..9942605cf43ebfeefcb93e0bd22829e62c30c953 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -42,7 +42,6 @@ AB_OTA_PARTITIONS += \ # Audio AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true -AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true AUDIO_FEATURE_ENABLED_HDMI_SPK := true AUDIO_FEATURE_ENABLED_INSTANCE_ID := true AUDIO_FEATURE_ENABLED_SSR := true @@ -51,7 +50,6 @@ USE_CUSTOM_AUDIO_POLICY := 1 # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include -TARGET_USE_QTI_BT_STACK := true # Bootloader TARGET_BOOTLOADER_BOARD_NAME := FP4 @@ -153,7 +151,7 @@ TARGET_USERIMAGES_USE_F2FS := true ENABLE_VENDOR_RIL_SERVICE := true # Security patch level -VENDOR_SECURITY_PATCH := 2022-11-05 +VENDOR_SECURITY_PATCH := 2022-12-05 # SEPolicy include device/qcom/sepolicy_vndr/SEPolicy.mk diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf index c4a6f896652f30138ac7380d0a8688ca91bf5d05..da005c55e8604bfc4dc1aebe2396d06a6eee2785 100644 --- a/audio/audio_io_policy.conf +++ b/audio/audio_io_policy.conf @@ -13,9 +13,9 @@ outputs { default { flags AUDIO_OUTPUT_FLAG_PRIMARY - formats AUDIO_FORMAT_PCM_16_BIT + formats AUDIO_FORMAT_PCM_24_BIT_PACKED sampling_rates 48000 - bit_width 16 + bit_width 24 app_type 69937 } proaudio { @@ -34,9 +34,9 @@ outputs { } deep_buffer { flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER - formats AUDIO_FORMAT_PCM_16_BIT + formats AUDIO_FORMAT_PCM_24_BIT_PACKED sampling_rates 48000 - bit_width 16 + bit_width 24 app_type 69936 } direct_pcm_16 { diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index e04dac357ea36bc596d4b3cfa6d2a4c87d6ac19d..0677a698c65a5ca54fe63b902e4c9d501828d967 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -1,5 +1,5 @@ - + samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> - - - + samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC"> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC"> + encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC"> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/> @@ -302,11 +292,6 @@ samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/> - - - - + sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,Telephony Rx"/> - - - - - - - - - - - - - - - - - - + + @@ -428,8 +392,8 @@ - - + + diff --git a/audio/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/audio_policy_configuration_a2dp_offload_disabled.xml new file mode 100644 index 0000000000000000000000000000000000000000..8bc77d55e4810a12f03f872fa347f08b4451e2d1 --- /dev/null +++ b/audio/audio_policy_configuration_a2dp_offload_disabled.xml @@ -0,0 +1,387 @@ + + + + + + + + + + + + + + + + + Earpiece + Speaker + Telephony Tx + Built-In Mic + Built-In Back Mic + Telephony Rx + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/bluetooth_hearing_aid_audio_policy_configuration.xml b/audio/bluetooth_hearing_aid_audio_policy_configuration.xml new file mode 100644 index 0000000000000000000000000000000000000000..7dcabf7faedd993f23ce5acaa7b7457aab143a9c --- /dev/null +++ b/audio/bluetooth_hearing_aid_audio_policy_configuration.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + diff --git a/audio/bluetooth_qti_audio_policy_configuration.xml b/audio/bluetooth_qti_audio_policy_configuration.xml deleted file mode 100644 index f0b2506282a8ee3965bdd3612c1664f50831d3bb..0000000000000000000000000000000000000000 --- a/audio/bluetooth_qti_audio_policy_configuration.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml b/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml deleted file mode 100644 index 7707ae1103b2d279e0f3d3ff29c9608d901637b1..0000000000000000000000000000000000000000 --- a/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/audio/mixer_paths_lagoon_fp4.xml b/audio/mixer_paths_lagoon_fp4.xml index 78bc7356fb6fb0fd0bf46cdc9a6c19f33ca4fdb6..285fb72761ee6a8c7a5497037184f21c90044c8c 100644 --- a/audio/mixer_paths_lagoon_fp4.xml +++ b/audio/mixer_paths_lagoon_fp4.xml @@ -3686,7 +3686,16 @@ - + + + + + + + + + + diff --git a/configs/component-overrides.xml b/configs/component-overrides.xml index 7201f9fa3375e20a5ec48ed67047745b2c961a16..4d058d340933852838871a15005cdd15511c5ef1 100644 --- a/configs/component-overrides.xml +++ b/configs/component-overrides.xml @@ -12,6 +12,8 @@ --> + + diff --git a/configs/component-overrides_qti.xml b/configs/component-overrides_qti.xml deleted file mode 100644 index 4daa78387d992599fd2cb851d9815e7ae840920c..0000000000000000000000000000000000000000 --- a/configs/component-overrides_qti.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - diff --git a/configs/diag/1_default.cfg b/configs/diag/1_default.cfg new file mode 100644 index 0000000000000000000000000000000000000000..d45838256843162680e61384dab03e02d3a97633 Binary files /dev/null and b/configs/diag/1_default.cfg differ diff --git a/configs/diag/2_protocol_audio_vocoder.cfg b/configs/diag/2_protocol_audio_vocoder.cfg new file mode 100644 index 0000000000000000000000000000000000000000..223454b588bee98ce8618091777bcf2439acad56 Binary files /dev/null and b/configs/diag/2_protocol_audio_vocoder.cfg differ diff --git a/configs/diag/3_BT_WLAN_FM.cfg b/configs/diag/3_BT_WLAN_FM.cfg new file mode 100644 index 0000000000000000000000000000000000000000..d67abd4fc810870bf6458928913d7e8034b3b2f9 Binary files /dev/null and b/configs/diag/3_BT_WLAN_FM.cfg differ diff --git a/configs/diag/4_GNSS_New.cfg b/configs/diag/4_GNSS_New.cfg new file mode 100644 index 0000000000000000000000000000000000000000..9c148375c4b1f831e88c4a10edc888d1dbdd8c62 Binary files /dev/null and b/configs/diag/4_GNSS_New.cfg differ diff --git a/configs/diag/5_audio_network.cfg b/configs/diag/5_audio_network.cfg new file mode 100644 index 0000000000000000000000000000000000000000..ff65a85f0846e5049ab3cb65dcc0a52abd368d6a Binary files /dev/null and b/configs/diag/5_audio_network.cfg differ diff --git a/configs/diag/6_nw_uim_ds_wms.cfg b/configs/diag/6_nw_uim_ds_wms.cfg new file mode 100644 index 0000000000000000000000000000000000000000..6caf473004190e819bc7cf1f43227f33d4ab9283 Binary files /dev/null and b/configs/diag/6_nw_uim_ds_wms.cfg differ diff --git a/configs/diag/7_driver_sensors.cfg b/configs/diag/7_driver_sensors.cfg new file mode 100644 index 0000000000000000000000000000000000000000..fd49f427db6c77b3cc8b1ebdbb76624274242aa0 Binary files /dev/null and b/configs/diag/7_driver_sensors.cfg differ diff --git a/configs/gps.conf b/configs/gps.conf new file mode 100644 index 0000000000000000000000000000000000000000..0108d8955fd8bef84241fb6e0c381a6cfd33fd89 --- /dev/null +++ b/configs/gps.conf @@ -0,0 +1,391 @@ +# Error Estimate +# _SET = 1 +# _CLEAR = 0 +ERR_ESTIMATE=0 + +#NTP server +NTP_SERVER=pool.ntp.org + +#XTRA CA path +XTRA_CA_PATH=/usr/lib/ssl-1.1/certs + +# DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info +# 4 - Debug, 5 - Verbose +# If DEBUG_LEVEL is commented, Android's logging levels will be used +DEBUG_LEVEL = 3 + +# Intermediate position report, 1=enable, 0=disable +INTERMEDIATE_POS=0 + +# supl version 2.0 +SUPL_VER=0x20000 + +# Emergency SUPL, 1=enable, 0=disable +#SUPL_ES=1 + +#Choose PDN for Emergency SUPL +#1 - Use emergency PDN +#0 - Use regular SUPL PDN for Emergency SUPL +#USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0 + +#SUPL_MODE is a bit mask set in config.xml per carrier by default. +#If it is uncommented here, this value will overwrite the value from +#config.xml. +#MSA=0X2 +#MSB=0X1 +#SUPL_MODE= + +# GPS Capabilities bit mask +# SCHEDULING = 0x01 +# MSB = 0x02 +# MSA = 0x04 +# ON_DEMAND_TIME = 0x10 +# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING +CAPABILITIES=0x17 + +# Accuracy threshold for intermediate positions +# less accurate positions are ignored, 0 for passing all positions +# ACCURACY_THRES=5000 + +################################ +##### AGPS server settings ##### +################################ + +# FOR SUPL SUPPORT, set the following +# SUPL_HOST=supl.host.com or IP +# SUPL_PORT=1234 + +# FOR MO SUPL SUPPORT, set the following +# MO_SUPL_HOST=supl.host.com or IP +# MO_SUPL_PORT=1234 + +# FOR C2K PDE SUPPORT, set the following +# C2K_HOST=c2k.pde.com or IP +# C2K_PORT=1234 + +# Bitmask of slots that are available +# for write/install to, where 1s indicate writable, +# and the default value is 0 where no slots +# are writable. For example, AGPS_CERT_WRITABLE_MASK +# of b1000001010 makes 3 slots available +# and the remaining 7 slots unwritable. +#AGPS_CERT_WRITABLE_MASK=0 + +#################################### +# LTE Positioning Profile Settings +#################################### +# LPP_PROFILE is a bit mask +# 0: Enable RRLP on LTE(Default) +# 0x1: LPP User Plane +# 0x2: LPP Control Plane +# 0x4: LPP User Plane for NR5G +# 0x8: LPP Control Plane for NR5G +LPP_PROFILE = 2 + +#################################### +#Datum Type +#################################### +# 0: WGS-84 +# 1: PZ-90 +DATUM_TYPE = 0 + +################################ +# EXTRA SETTINGS +################################ +# NMEA provider (1=Modem Processor, 0=Application Processor) +NMEA_PROVIDER=0 + +################################ +# NMEA TAG BLOCK GROUPING +################################ +# NMEA tag block grouping is only applicable to GSA +# Default is disabled +# 0 - disabled +# 1 - enabled +NMEA_TAG_BLOCK_GROUPING_ENABLED = 0 + +# Customized NMEA GGA fix quality that can be used to tell +# whether SENSOR contributed to the fix. +# +# When this configuration item is not enabled (set to any value that is not 1), +# GGA fix quality conforms to NMEA standard spec as below: +# PPP/DGNSS/SBAS correction fix w/ or w/o sensor: 2 +# RTK fixed fix w/ or w/o sensor: 4 +# RTK float fix w/ or w/o sensor: 5 +# SPE fix w/ or w/o sensor: 1 +# Sensor dead reckoning fix: 6 +# +# When this configuration is enabled (set to 1), GGA fix quality +# will be output as below: +# PPP fix w/o sensor: 59, w/ sensor: 69 +# DGNSS/SBAS correction fix w/o sensor: 2, w/ sensor: 62 +# RTK fixed fix w/o sensor: 4, w/ sensor: 64 +# RTK float fix w/o sensor: 5, w/ sensor: 65, +# SPE fix w/o sensor: 1, and w/ sensor: 61 +# Sensor dead reckoning fix: 6 +# +# any value that is not 1 - disabled +# 1 - enabled +CUSTOM_NMEA_GGA_FIX_QUALITY_ENABLED = 0 + +################################ +# NMEA Reporting Rate Config, valid only when NMEA_PROVIDER is set to "0" +################################ +# NMEA Reporting Rate +# Set it to "1HZ" for 1Hz NMEA Reporting +# Set it to "NHZ" for NHz NMEA Reporting +#Default : NHZ (overridden by position update rate if set to lower rates) +NMEA_REPORT_RATE=NHZ + +# Mark if it is a SGLTE target (1=SGLTE, 0=nonSGLTE) +SGLTE_TARGET=0 + +################################################## +# Select Positioning Protocol on A-GLONASS system +################################################## +# 0x1: RRC CPlane +# 0x2: RRLP UPlane +# 0x4: LLP Uplane +A_GLONASS_POS_PROTOCOL_SELECT = 0xF + +################################################## +# Select technology for LPPe Control Plane +################################################## +# 0x1: DBH for LPPe CP +# 0x2: WLAN AP Measurements for LPPe CP +# 0x4: SRN AP measurement for CP +# 0x8: Sensor Barometer Measurement LPPe CP +#LPPE_CP_TECHNOLOGY = 0 + +################################################## +# Select technology for LPPe User Plane +################################################## +# 0x1: DBH for LPPe UP +# 0x2: WLAN AP Measurements for LPPe UP +# 0x4: SRN AP measurement for UP +# 0x8: Sensor Barometer Measurement LPPe UP +#LPPE_UP_TECHNOLOGY = 0 + +################################################## +# AGPS_CONFIG_INJECT +################################################## +# enable/disable injection of AGPS configurations: +# SUPL_VER +# SUPL_HOST +# SUPL_PORT +# MO_SUPL_HOST +# MO_SUPL_PORT +# C2K_HOST +# C2K_PORT +# LPP_PROFILE +# A_GLONASS_POS_PROTOCOL_SELECT +# 0: disable +# 1: enable +AGPS_CONFIG_INJECT = 1 + +################################################## +# GNSS settings for automotive use cases +# Configurations in following section are +# specific to automotive use cases, others +# please do not change, keep the default values +################################################## + +# AP Coarse Timestamp Uncertainty +################################################## +# default : 10 +# AP time stamp uncertainty, until GNSS receiver +# is able to acquire better timing information +AP_TIMESTAMP_UNCERTAINTY = 10 + +##################################### +# DR_SYNC Pulse Availability +##################################### +# 0 : DR_SYNC pulse not available (default) +# 1 : DR_SYNC pulse available +# This configuration enables the driver to make use +# of PPS events generated by DR_SYNC pulse +# Standard Linux PPS driver needs to be enabled +DR_SYNC_ENABLED = 0 + +##################################### +# PPS Device name +##################################### +PPS_DEVICENAME = /dev/pps0 + +##################################### +# Ignore PPS at Startup and after long outage +##################################### +IGNORE_PPS_PULSE_COUNT = 1 + +##################################### +# Long GNSS RF outage in seconds +##################################### +GNSS_OUTAGE_DURATION = 10 + +##################################### +# AP Clock Accuracy +##################################### +# Quality of APPS processor clock (in PPM). +# Value specified is used for calculation of +# APPS time stamp uncertainty +AP_CLOCK_PPM = 100 + +##################################### +# MAX ms difference to detect missing pulse +##################################### +# Specifies time threshold in ms to validate any missing PPS pulses +MISSING_PULSE_TIME_DELTA = 900 + +##################################### +# Propagation time uncertainty +##################################### +# This settings enables time uncertainty propagation +# logic incase of missing PPS pulse +PROPAGATION_TIME_UNCERTAINTY = 1 + +####################################### +# APN / IP Type Configuration +# APN and IP Type to use for setting +# up WWAN call. +# Use below values for IP Type: +# v4 = 4 +# v6 = 6 +# v4v6 = 10 +####################################### +# INTERNET_APN = abc.xyz +# INTERNET_IP_TYPE = 4 +# SUPL_APN = abc.xyz +# SUPL_IP_TYPE = 4 + +##################################### +# Modem type +##################################### +# This setting configures modem type +# (external=0 or internal=1) +# comment out the next line to vote +# for the first modem in the list +MODEM_TYPE = 1 + +################################################## +# CONSTRAINED TIME UNCERTAINTY MODE +################################################## +# 0 : disabled (default) +# 1 : enabled +# This setting enables GPS engine to keep its time +# uncertainty below the specified constraint +#CONSTRAINED_TIME_UNCERTAINTY_ENABLED = 0 + +# If constrained time uncertainty mode is enabled, +# this setting specifies the time uncertainty +# threshold that gps engine need to maintain. +# In unit of milli-seconds. +# Default is 0.0 meaning that modem default value +# of time uncertainty threshold will be used. +#CONSTRAINED_TIME_UNCERTAINTY_THRESHOLD = 0.0 + +# If constrained time uncertainty mode is enabled, +# this setting specifies the power budget that +# gps engine is allowed to spend to maintain the time +# uncertainty. +# Default is 0 meaning that GPS engine is not constained +# by power budget and can spend as much power as needed. +# In unit of 0.1 milli watt second. +#CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET = 0 + +################################################## +# POSITION ASSISTED CLOCK ESTIMATOR +################################################## +# 0 : disabled (default) +# 1 : enabled +# This setting enables GPS engine to estimate clock +# bias and drift when the signal from at least 1 +# SV is available and the UEs position is known by +# other position engines. +#POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED = 0 + +##################################### +# proxyAppPackageName +##################################### +# This is a string that is sent to the framework +# in nfwNotifyCb callback +PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation + +##################################### +# CP_MTLR_ES +##################################### +# CP MTLR ES, 1=enable, 0=disable +CP_MTLR_ES=0 + +################################################## +# GNSS_DEPLOYMENT +################################################## +# 0 : Enable QTI GNSS (default) +# 1 : Enable QCSR SS5 +# 2 : Enable PDS API +# This setting use to select between QTI GNSS, +# QCSR SS5 hardware receiver, and PDS API. +# By default QTI GNSS receiver is enabled. +# GNSS_DEPLOYMENT = 0 + +################################################## +## LOG BUFFER CONFIGURATION +################################################## +#LOG_BUFFER_ENABLED, 1=enable, 0=disable +#*_LEVEL_TIME_DEPTH, maximum time depth of level * +#in log buffer, unit is second +#*_LEVEL_MAX_CAPACITY, maximum numbers of level * +#log print sentences in log buffer +LOG_BUFFER_ENABLED = 0 +E_LEVEL_TIME_DEPTH = 600 +E_LEVEL_MAX_CAPACITY = 50 +W_LEVEL_TIME_DEPTH = 500 +W_LEVEL_MAX_CAPACITY = 100 +I_LEVEL_TIME_DEPTH = 400 +I_LEVEL_MAX_CAPACITY = 200 +D_LEVEL_TIME_DEPTH = 30 +D_LEVEL_MAX_CAPACITY = 300 +V_LEVEL_TIME_DEPTH = 200 +V_LEVEL_MAX_CAPACITY = 400 + +################################################## +# Allow buffer diag log packets when diag memory allocation +# fails during boot up time. +################################################## +BUFFER_DIAG_LOGGING = 1 + +####################################### +# NTRIP CLIENT LIBRARY NAME +####################################### +# NTRIP_CLIENT_LIB_NAME = + +################################################## +# Correction Data Framework settings +# Default values: +# CDFW_SOURCE_PRIORITY_1 = INTERNAL_1 RTCM +# CDFW_INJECT_DATA_INTERVAL = 600000 //10 mins +# CDFW_RTCM_MESSAGE_INTERVAL = 1000 //1 second +# +# If multiple sources coexist on a PL, +# the prorioty sequence can be set by the integer number. +# PRIORITY_1 is higher than PRIORITY_2, for example, +# CDFW_SOURCE_PRIORITY_1 = INTERNAL_1 RTCM +# CDFW_SOURCE_PRIORITY_2 = CV2X RTCM +################################################## + +################################################## +# RF LOSS +# The loss in 0.1 dbHz from the C/N0 at the antenna port +# These values must be configured by OEM if not +# supported in QMI LOC message +# There is one entry for each signal type +################################################## +RF_LOSS_GPS = 0 +RF_LOSS_GPS_L5 = 0 +RF_LOSS_GLO_LEFT = 0 +RF_LOSS_GLO_CENTER = 0 +RF_LOSS_GLO_RIGHT = 0 +RF_LOSS_BDS = 0 +RF_LOSS_BDS_B2A = 0 +RF_LOSS_GAL = 0 +RF_LOSS_GAL_E5 = 0 +RF_LOSS_NAVIC = 0 diff --git a/device.mk b/device.mk index 38ad939793ef73afef9d0239f8441612c0ae1f7f..9369a782c57836e06011cafbae2cece172d5b910 100644 --- a/device.mk +++ b/device.mk @@ -155,14 +155,14 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \ $(LOCAL_PATH)/audio/audio_platform_info_lagoon_fp4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_lagoon_fp4.xml \ $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ + $(LOCAL_PATH)/audio/bluetooth_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_hearing_aid_audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/mixer_paths_lagoon_fp4.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_lagoon_fp4.xml \ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml PRODUCT_COPY_FILES += \ - frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ @@ -176,7 +176,9 @@ PRODUCT_PACKAGES += \ # Bluetooth PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0.vendor:64 \ + android.hardware.bluetooth.audio@2.0-impl \ audio.bluetooth.default \ + audio.hearing_aid.default \ com.dsi.ant@1.0.vendor \ vendor.qti.hardware.bluetooth_audio@2.1.vendor \ vendor.qti.hardware.btconfigstore@1.0.vendor \ @@ -191,8 +193,17 @@ PRODUCT_PACKAGES += \ # Component overrides PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ - $(LOCAL_PATH)/configs/component-overrides_qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/component-overrides.xml + $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml + +# Diag cfgs +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/diag/1_default.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/diag/1_default.cfg \ + $(LOCAL_PATH)/configs/diag/2_protocol_audio_vocoder.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/diag/2_protocol_audio_vocoder.cfg \ + $(LOCAL_PATH)/configs/diag/3_BT_WLAN_FM.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/diag/3_BT_WLAN_FM.cfg \ + $(LOCAL_PATH)/configs/diag/4_GNSS_New.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/diag/4_GNSS_New.cfg \ + $(LOCAL_PATH)/configs/diag/5_audio_network.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/diag/5_audio_network.cfg \ + $(LOCAL_PATH)/configs/diag/6_nw_uim_ds_wms.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/diag/6_nw_uim_ds_wms.cfg \ + $(LOCAL_PATH)/configs/diag/7_driver_sensors.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/diag/7_driver_sensors.cfg # Display PRODUCT_PACKAGES += \ @@ -202,6 +213,8 @@ PRODUCT_PACKAGES += \ android.hardware.memtrack@1.0-service \ android.hardware.renderscript@1.0-impl \ gralloc.lito \ + init.qti.display_boot.sh \ + init.qti.display_boot.rc \ memtrack.lito \ libdisplayconfig.qti \ libdisplayconfig.qti.vendor \ @@ -244,6 +257,9 @@ PRODUCT_PACKAGES += \ android.hardware.gnss.visibility_control@1.0.vendor:64 \ android.hardware.gnss@2.1.vendor:64 +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/configs/gps.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gps.conf + # Health PRODUCT_PACKAGES += \ android.hardware.health@2.1-impl \ diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml index 066bcd6031a9e1e43974fb68ab18f95d70156a6f..92f4a35dada7ce1b31c970152ae8889b7f8ccb6c 100644 --- a/framework_compatibility_matrix.xml +++ b/framework_compatibility_matrix.xml @@ -1,12 +1,11 @@ - + android.hardware.automotive.evs 1.1 IEvsEnumerator - EvsEnumeratorHw - EvsEnumeratorHw-Mock default + hw/1 @@ -131,7 +130,7 @@ vendor.display.color - 1.0-6 + 1.0-7 IDisplayColor default @@ -154,6 +153,31 @@ default + + vendor.fpsensor.hardware.fpsensorhidlsvc + 2.0 + + IFpsensorHidlSvc + default + + + + vendor.nxp.hardware.nfc + 1.0-1 + 2.0 + + INqNfc + default + + + + vendor.nxp.nxpnfclegacy + 1.0 + + INxpNfcLegacy + default + + vendor.pixelworks.hardware.display 1.1 @@ -181,7 +205,7 @@ vendor.qti.data.factory 1.0 - 2.0-3 + 2.0-5 IFactory default @@ -195,6 +219,14 @@ default + + vendor.qti.dvr + 1.0 + + IDvrDisplay + default + + vendor.qti.esepowermanager 1.0-1 @@ -214,6 +246,13 @@ gnss_vendor + + vendor.qti.gnss + + ILocAidlGnss + default + + vendor.qti.hardware.AGMIPC 1.0 @@ -222,6 +261,14 @@ default + + vendor.qti.hardware.ListenSoundModel + 1.0 + + IListenSoundModel + default + + vendor.qti.hardware.alarm 1.0 @@ -263,6 +310,22 @@ default + + vendor.qti.hardware.cacert + 1.0 + + IService + default + + + + vendor.qti.hardware.camera.aon + 1.0-1 + + IAONService + aoncameraservice + + vendor.qti.hardware.camera.postproc 1.0 @@ -304,9 +367,17 @@ slot2 + + vendor.qti.hardware.data.connectionfactory + + IFactory + slot0 + slot1 + + vendor.qti.hardware.data.iwlan - 1.0 + 1.0-1 IIWlan slot1 @@ -343,11 +414,20 @@ vendor.qti.hardware.display.composer 2.0-1 3.0 + 3.1 IQtiComposer default + + vendor.qti.hardware.display.config + 1-5 + + IDisplayConfig + default + + vendor.qti.hardware.display.demura 1.0 @@ -367,6 +447,14 @@ default + + vendor.qti.hardware.dpmservice + 1.0-1 + + IDpmService + DpmService + + vendor.qti.hardware.dsp 1.0 @@ -457,7 +545,7 @@ vendor.qti.hardware.limits - 1.0 + 1.0-1 ILimits default @@ -481,15 +569,23 @@ vendor.qti.hardware.perf - 2.0-2 + 2.0-3 IPerf default - vendor.qti.hardware.qccsyshal + vendor.qti.hardware.power.powermodule 1.0 + + IPowerModule + default + + + + vendor.qti.hardware.qccsyshal + 1.0-1 IQccsyshal qccsyshal @@ -539,6 +635,41 @@ default + + vendor.qti.hardware.qxr + + IQXRCoreService + default + + + + vendor.qti.hardware.qxr + + IQXRCamService + default + + + + vendor.qti.hardware.qxr + + IQXRSplitService + default + + + + vendor.qti.hardware.qxr + + IQXRModService + default + + + + vendor.qti.hardware.qxr + + IQXRAudioService + default + + vendor.qti.hardware.radio.am 1.0 @@ -548,9 +679,26 @@ slot2 + + vendor.qti.hardware.radio.am + + IQcRilAudio + slot1 + slot2 + + vendor.qti.hardware.radio.ims - 1.0-7 + 1.0-8 + + IImsRadio + imsradio0 + imsradio1 + + + + vendor.qti.hardware.radio.ims + 1-6 IImsRadio imsradio0 @@ -567,7 +715,7 @@ vendor.qti.hardware.radio.lpa - 1.0-1 + 1.0-2 IUimLpa UimLpa0 @@ -593,6 +741,15 @@ slot2 + + vendor.qti.hardware.radio.qtiradio + 1-5 + + IQtiRadioStable + slot1 + slot2 + + vendor.qti.hardware.radio.uim 1.1-2 @@ -756,6 +913,14 @@ default + + vendor.qti.hardware.wifi.wificfr + 1.0 + + IWificfr + wificfr + + vendor.qti.hardware.wifi.wifilearner 1.0 @@ -827,6 +992,7 @@ vendor.qti.ims.factory 1.0-1 + 2.0-1 IImsFactory default @@ -848,6 +1014,14 @@ pasrhal + + vendor.qti.mstatservice + 1.0 + + IMStatService + mstatservice + + vendor.qti.power.pasrmanager 1.0 @@ -875,6 +1049,7 @@ vendor.qti.spu 1.0-1 + 2.0 ISPUManager default diff --git a/lineage_FP4.mk b/lineage_FP4.mk index bcad657990a5cb1a176a17816badfe7be39d5efc..2dea5032d2beec90817d11f633760c79b2b7b969 100644 --- a/lineage_FP4.mk +++ b/lineage_FP4.mk @@ -25,11 +25,11 @@ PRODUCT_BRAND := Fairphone PRODUCT_MODEL := FP4 PRODUCT_MANUFACTURER := Fairphone -BUILD_FINGERPRINT := "Fairphone/FP4eea/FP4:11/RKQ1.210503.001/FP4I:user/release-keys" +BUILD_FINGERPRINT := "Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP1Y:user/release-keys" PRODUCT_BUILD_PROP_OVERRIDES += \ TARGET_NAME=FP4eea \ PRODUCT_NAME=FP4eea \ - PRIVATE_BUILD_DESC="qssi-user 11 RKQ1.210503.001 FP4I release-keys" + PRIVATE_BUILD_DESC="qssi-user 12 SKQ1.220201.001 SP1W release-keys" PRODUCT_GMS_CLIENTID_BASE := android-alcatel diff --git a/manifest.xml b/manifest.xml index 227f8cef66078cae61500c75e8fae6cf63252681..cab51e476fafda5e388d9aa63e43fce5edca80b4 100644 --- a/manifest.xml +++ b/manifest.xml @@ -29,6 +29,16 @@ @1.0::IBluetoothHci/default + + android.hardware.bluetooth.audio + hwbinder + 2.0 + + IBluetoothAudioProvidersFactory + default + + @2.0::IBluetoothAudioProvidersFactory/default + android.hardware.camera.provider hwbinder @@ -198,6 +208,16 @@ @2.3::IUceService/com.qualcomm.qti.uceservice + + vendor.fpsensor.hardware.fpsensorhidlsvc + hwbinder + 2.0 + + IFpsensorHidlSvc + default + + @2.0::IFpsensorHidlSvc/default + vendor.qti.data.factory hwbinder diff --git a/media/media_codecs.xml b/media/media_codecs.xml index 699f935d4d7317e4b27c40b143867acab399dd45..4072750ddae9ca7016f4b23f6e92061b048a35b7 100644 --- a/media/media_codecs.xml +++ b/media/media_codecs.xml @@ -219,6 +219,7 @@ Only the three quirks included above are recognized at this point: + diff --git a/media/media_codecs_c2.xml b/media/media_codecs_c2.xml index 3076916d13dc665dfbfc71a9a812af3a7d06a642..769fff65596b06a3fc3a95dca8bd3a04615b5c3c 100644 --- a/media/media_codecs_c2.xml +++ b/media/media_codecs_c2.xml @@ -243,8 +243,8 @@ - - + + @@ -380,8 +380,8 @@ - - + + diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml index e4e44d4fd6fba765f18736da5266f33f828703fe..dba2ce1655f9e04ccd436cb127adc038f99b6a78 100644 --- a/media/media_codecs_performance.xml +++ b/media/media_codecs_performance.xml @@ -97,13 +97,13 @@ limitations under the License. - + - + @@ -125,7 +125,7 @@ limitations under the License. - + @@ -183,6 +183,8 @@ limitations under the License. + + diff --git a/media/media_codecs_performance_c2.xml b/media/media_codecs_performance_c2.xml index 2993d2f44cdc180b6df0d09c118abe1650f9ff4d..a9a45929d8347bf6f7c0302e24fc8ee4bd7ef15a 100644 --- a/media/media_codecs_performance_c2.xml +++ b/media/media_codecs_performance_c2.xml @@ -132,6 +132,8 @@ + + diff --git a/media/media_codecs_performance_v1.xml b/media/media_codecs_performance_v1.xml index d02b672927c54459c20fcbd1fd67923ea8699625..55db4df4797418b7417bbe742f84fe8538318992 100644 --- a/media/media_codecs_performance_v1.xml +++ b/media/media_codecs_performance_v1.xml @@ -183,6 +183,8 @@ limitations under the License. + + diff --git a/media/media_codecs_performance_v2.xml b/media/media_codecs_performance_v2.xml index 043dc017b5286d73289adf6b4769101998a861b6..a042b33002a45e30560a91ab4d9a2e9c4cad0d6e 100644 --- a/media/media_codecs_performance_v2.xml +++ b/media/media_codecs_performance_v2.xml @@ -171,6 +171,8 @@ limitations under the License. + + diff --git a/media/media_codecs_performance_v3.xml b/media/media_codecs_performance_v3.xml index da92aeab83faffe55ec8d2eeeb74400b4f7cf290..319156f418845a018102e0ae321c8491c175d1f1 100644 --- a/media/media_codecs_performance_v3.xml +++ b/media/media_codecs_performance_v3.xml @@ -171,6 +171,8 @@ limitations under the License. + + diff --git a/media/media_codecs_vendor.xml b/media/media_codecs_vendor.xml index 705f3cd0d5943f9a38e88d35687ee41837131b76..20ec969202e0397d837ce98b4a2011741e876c0f 100644 --- a/media/media_codecs_vendor.xml +++ b/media/media_codecs_vendor.xml @@ -240,6 +240,7 @@ Only the three quirks included above are recognized at this point: + diff --git a/media/media_codecs_vendor_v2.xml b/media/media_codecs_vendor_v2.xml index 689bcd03d0567726476ec81c383472822d57a671..d8309ff3b37a2d2a95dc65a17d969687778f3f9e 100644 --- a/media/media_codecs_vendor_v2.xml +++ b/media/media_codecs_vendor_v2.xml @@ -140,6 +140,7 @@ Only the three quirks included above are recognized at this point: + @@ -158,6 +159,7 @@ Only the three quirks included above are recognized at this point: + @@ -199,6 +201,7 @@ Only the three quirks included above are recognized at this point: + @@ -211,7 +214,9 @@ Only the three quirks included above are recognized at this point: + + @@ -227,6 +232,7 @@ Only the three quirks included above are recognized at this point: + @@ -243,6 +249,7 @@ Only the three quirks included above are recognized at this point: + @@ -258,6 +265,7 @@ Only the three quirks included above are recognized at this point: + @@ -271,6 +279,7 @@ Only the three quirks included above are recognized at this point: + @@ -285,6 +294,7 @@ Only the three quirks included above are recognized at this point: + @@ -301,6 +311,7 @@ Only the three quirks included above are recognized at this point: + @@ -316,6 +327,7 @@ Only the three quirks included above are recognized at this point: + @@ -332,6 +344,7 @@ Only the three quirks included above are recognized at this point: + @@ -348,6 +361,7 @@ Only the three quirks included above are recognized at this point: + @@ -361,6 +375,7 @@ Only the three quirks included above are recognized at this point: + diff --git a/media/media_codecs_vendor_v3.xml b/media/media_codecs_vendor_v3.xml index 21815f341f7957331541c0047b1c737531e61e2a..552b799241b1f78f0935c1e7356cd83e844eff7b 100644 --- a/media/media_codecs_vendor_v3.xml +++ b/media/media_codecs_vendor_v3.xml @@ -140,6 +140,7 @@ Only the three quirks included above are recognized at this point: + @@ -158,6 +159,7 @@ Only the three quirks included above are recognized at this point: + @@ -199,6 +201,7 @@ Only the three quirks included above are recognized at this point: + @@ -211,7 +214,9 @@ Only the three quirks included above are recognized at this point: + + @@ -227,6 +232,7 @@ Only the three quirks included above are recognized at this point: + @@ -243,6 +249,7 @@ Only the three quirks included above are recognized at this point: + @@ -259,6 +266,7 @@ Only the three quirks included above are recognized at this point: + @@ -272,6 +280,7 @@ Only the three quirks included above are recognized at this point: + @@ -286,6 +295,7 @@ Only the three quirks included above are recognized at this point: + @@ -302,6 +312,7 @@ Only the three quirks included above are recognized at this point: + @@ -318,6 +329,7 @@ Only the three quirks included above are recognized at this point: + @@ -334,6 +346,7 @@ Only the three quirks included above are recognized at this point: + @@ -351,6 +364,7 @@ Only the three quirks included above are recognized at this point: + @@ -364,6 +378,7 @@ Only the three quirks included above are recognized at this point: + diff --git a/media/media_profiles_vendor.xml b/media/media_profiles_vendor.xml index 2fd1f9b9f5d133b0772929be08b51d5653675c63..a4df3d8c64a6cb456ae440443826dbe0a1a88270 100644 --- a/media/media_profiles_vendor.xml +++ b/media/media_profiles_vendor.xml @@ -186,7 +186,7 @@ channels="2" /> - + - + - + - + - + - + - + - +