From 19109b18aeebdc371dd52da5a9335e2a08742b23 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Fri, 25 Nov 2022 10:02:59 +0530
Subject: [PATCH 01/30] FP4: Add missing fingerprint libs

* Logs mention them
---
 framework_compatibility_matrix.xml         |  8 ++++++++
 manifest.xml                               | 10 ++++++++++
 proprietary-files.txt                      |  2 ++
 sepolicy/vendor/hal_fingerprint_default.te |  2 ++
 sepolicy/vendor/hwservice.te               |  1 +
 sepolicy/vendor/hwservice_contexts         |  1 +
 6 files changed, 24 insertions(+)

diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index 066bcd6..5aed642 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -154,6 +154,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.fpsensor.hardware.fpsensorhidlsvc</name>
+        <version>2.0</version>
+        <interface>
+            <name>IFpsensorHidlSvc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.pixelworks.hardware.display</name>
         <version>1.1</version>
diff --git a/manifest.xml b/manifest.xml
index 227f8ce..8ead6a5 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -198,6 +198,16 @@
         </interface>
         <fqname>@2.3::IUceService/com.qualcomm.qti.uceservice</fqname>
     </hal>
+    <hal format="hidl">
+        <name>vendor.fpsensor.hardware.fpsensorhidlsvc</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IFpsensorHidlSvc</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@2.0::IFpsensorHidlSvc/default</fqname>
+    </hal>
     <hal format="hidl">
         <name>vendor.qti.data.factory</name>
         <transport>hwbinder</transport>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 000dfbc..15ae394 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -402,6 +402,8 @@ vendor/etc/init/feature_enabler_client.rc
 # Fingerprint
 vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service
 vendor/lib64/hw/fpsensor_fingerprint.default.so
+vendor/lib64/libfp_ext_svc2.so
+vendor/lib64/vendor.fpsensor.hardware.fpsensorhidlsvc@2.0.so
 
 # Gatekeeper
 vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
diff --git a/sepolicy/vendor/hal_fingerprint_default.te b/sepolicy/vendor/hal_fingerprint_default.te
index 1e8a862..f816d9d 100644
--- a/sepolicy/vendor/hal_fingerprint_default.te
+++ b/sepolicy/vendor/hal_fingerprint_default.te
@@ -2,3 +2,5 @@ allow hal_fingerprint_default fpsensor_fp_device:chr_file rw_file_perms;
 allow hal_fingerprint_default tee_device:chr_file rw_file_perms;
 
 set_prop(hal_fingerprint_default, vendor_t2m_sys_prop)
+
+add_hwservice(hal_fingerprint_default, fp_ext_svc2_hwservice)
diff --git a/sepolicy/vendor/hwservice.te b/sepolicy/vendor/hwservice.te
index c046c98..fd65be7 100644
--- a/sepolicy/vendor/hwservice.te
+++ b/sepolicy/vendor/hwservice.te
@@ -1,2 +1,3 @@
+type fp_ext_svc2_hwservice, hwservice_manager_type;
 type hal_display_hwservice, hwservice_manager_type;
 type hal_display_iris_hwservice, hwservice_manager_type;
diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts
index 72ffbb5..85d3109 100644
--- a/sepolicy/vendor/hwservice_contexts
+++ b/sepolicy/vendor/hwservice_contexts
@@ -1,2 +1,3 @@
+vendor.fpsensor.hardware.fpsensorhidlsvc::IFpsensorHidlSvc                 u:object_r:fp_ext_svc2_hwservice:s0
 vendor.pixelworks.hardware.display::IIris                                  u:object_r:hal_display_iris_hwservice:s0
 vendor.pixelworks.hardware.feature::IIrisFeature                           u:object_r:hal_display_iris_hwservice:s0
-- 
GitLab


From f3cead7990baceae0daa66cf42eb0f8e9ec6dcb6 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Thu, 17 Nov 2022 20:29:22 +0530
Subject: [PATCH 02/30] FP4: Bump blobs to FP4.SP1Y.B.041.20230109

Fingerprint: Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP1Y:user/release-keys
---
 BoardConfig.mk        |  2 +-
 lineage_FP4.mk        |  4 ++--
 proprietary-files.txt | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4c19665..aa7491e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -153,7 +153,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/lineage_FP4.mk b/lineage_FP4.mk
index bcad657..2dea503 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/proprietary-files.txt b/proprietary-files.txt
index 15ae394..f0733c9 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# Unpinned blobs from Fairphone/FP4eea/FP4:11/RKQ1.210503.001/FP4I:user/release-keys
+# Unpinned blobs from Fairphone/FP4eea/FP4:12/SKQ1.220201.001/SP1Y:user/release-keys
 
 # ACDB
 vendor/etc/acdbdata/MTP/lito-lagoon-fp4-snd-card/Bluetooth_cal.acdb
@@ -71,6 +71,7 @@ vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
 vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so
 vendor/lib64/libbtnv.so
+vendor/lib64/libsoc_helper.so
 vendor/lib64/vendor.qti.hardware.fm@1.0.so
 
 # Bluetooth (A2DP)
@@ -689,8 +690,8 @@ vendor/lib64/unnhal-acc-hta.so
 vendor/lib64/unnhal-acc-hvx.so
 
 # NFC
-vendor/bin/hw/android.hardware.nfc@1.2-service.st
-vendor/etc/init/android.hardware.nfc@1.2-service.st.rc
+vendor/bin/hw/android.hardware.nfc@1.2-service-st
+vendor/etc/init/android.hardware.nfc@1.2-service-st.rc
 vendor/lib64/nfc_nci.st21nfc.st.so
 
 # NFC (Configs)
@@ -849,7 +850,6 @@ system_ext/etc/permissions/qcrilhook.xml
 system_ext/etc/permissions/qti_libpermissions.xml
 system_ext/etc/permissions/qti_permissions.xml
 system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml
-system_ext/etc/permissions/telephonyservice.xml
 system_ext/framework/qcrilhook.jar
 -system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 -vendor/app/IWlanService/IWlanService.apk
@@ -913,6 +913,7 @@ vendor/lib64/vendor.qti.hardware.radio.atcmdfwd@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.internal.deviceinfo@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.lpa@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.lpa@1.1.so
+vendor/lib64/vendor.qti.hardware.radio.lpa@1.2.so
 vendor/lib64/vendor.qti.hardware.radio.qcrilhook@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.qtiradio@1.0.so
 vendor/lib64/vendor.qti.hardware.radio.qtiradio@2.0.so
@@ -1139,6 +1140,7 @@ vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so
 vendor/lib64/libGPQTEEC_vendor.so
 vendor/lib64/libGPTEE_vendor.so
 vendor/lib64/libQTEEConnector_vendor.so
+vendor/lib64/libQTEEConnector_listener.so
 vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so
 
 # Trusted User Interface
-- 
GitLab


From 9e149d7ba85dd34a433134e0804a2a83510aa396 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Wed, 8 Feb 2023 10:00:26 +0100
Subject: [PATCH 03/30] FP4: Update props from FP4.SP1Y.B.041.20230109

* Cleanup while we are at it
---
 system.prop     |  6 ++++++
 system_ext.prop |  6 ++++++
 vendor.prop     | 10 +++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 system_ext.prop

diff --git a/system.prop b/system.prop
index fab220d..9c999f7 100644
--- a/system.prop
+++ b/system.prop
@@ -18,6 +18,9 @@ persist.vendor.cne.feature=1
 # e-SIM
 masterclear.allow_retain_esim_profiles_after_fdr=1
 
+# GPS
+persist.backup.ntpServer=0.pool.ntp.org
+
 # IMS
 persist.dbg.volte_avail_ovr=1
 persist.dbg.vt_avail_ovr=1
@@ -44,3 +47,6 @@ telephony.lteOnCdmaDevice=1
 
 # Sensors
 persist.vendor.sensors.enable.mag_filter=true
+
+# System Server
+arm64.memtag.process.system_server=off
diff --git a/system_ext.prop b/system_ext.prop
new file mode 100644
index 0000000..6030f23
--- /dev/null
+++ b/system_ext.prop
@@ -0,0 +1,6 @@
+# DPM
+persist.vendor.dpm.feature=11
+
+# Telephony
+ro.telephony.sim_slots.count=2
+telephony.active_modems.max_count=2
diff --git a/vendor.prop b/vendor.prop
index 36e731f..768690e 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -66,11 +66,16 @@ ro.crypto.dm_default_key.options_format.version=2
 ro.crypto.volume.filenames_mode=aes-256-cts
 ro.crypto.volume.metadata.method=dm-default-key
 
+# Dalvik
+dalvik.vm.dex2oat64.enabled=true
+
 # Display
 vendor.display.comp_mask=0
 vendor.display.disable_excl_rect=0
 vendor.display.disable_excl_rect_partial_fb=1
 vendor.display.disable_hw_recovery_dump=1
+vendor.display.disable_idle_time_hdr=1
+vendor.display.disable_idle_time_video=1
 vendor.display.disable_offline_rotator=1
 vendor.display.disable_scaler=0
 vendor.display.enable_allow_idle_fallback=1
@@ -112,17 +117,12 @@ persist.sys.sf.color_saturation=1.0
 ro.gfx.driver.1=com.qualcomm.qti.gpudrivers.lito.api30
 ro.hardware.egl=adreno
 ro.hardware.vulkan=adreno
-#ro.opengles.version=196610
 vendor.gralloc.disable_ubwc=0
 vendor.opengles.version=196610
 
-# GPS
-persist.backup.ntpServer=0.pool.ntp.org
-
 # Media
 debug.stagefright.ccodec=1
 debug.stagefright.omx_default_rank=0
-media.settings.xml=/vendor/etc/media_profiles_vendor.xml
 
 # Netflix
 ro.netflix.bsp_rev=Q7250-19133-1
-- 
GitLab


From b8043f4502c8ccff32a7b864b06f0f2bc7022bc0 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Fri, 25 Nov 2022 10:02:59 +0530
Subject: [PATCH 04/30] FP4: Bump configs from FP4.SP1Y.B.041.20230109

---
 audio/audio_policy_configuration.xml  | 14 +++++-------
 audio/mixer_paths_lagoon_fp4.xml      | 11 ++++++++-
 media/media_codecs.xml                |  1 +
 media/media_codecs_c2.xml             |  8 +++----
 media/media_codecs_performance.xml    |  8 ++++---
 media/media_codecs_performance_c2.xml |  2 ++
 media/media_codecs_performance_v1.xml |  2 ++
 media/media_codecs_performance_v2.xml |  2 ++
 media/media_codecs_performance_v3.xml |  2 ++
 media/media_codecs_vendor.xml         |  1 +
 media/media_codecs_vendor_v2.xml      | 15 +++++++++++++
 media/media_codecs_vendor_v3.xml      | 15 +++++++++++++
 media/media_profiles_vendor.xml       | 32 +++++++++++++--------------
 13 files changed, 81 insertions(+), 32 deletions(-)

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index e04dac3..79b8ee6 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- Copyright (c) 2016-2020, The Linux Foundation. All rights reserved
+<!-- Copyright (c) 2016-2021, The Linux Foundation. All rights reserved
      Not a Contribution.
 -->
 <!-- Copyright (C) 2015 The Android Open Source Project
@@ -80,8 +80,6 @@
                 <mixPort name="hifi_playback" role="source" />
                 <mixPort name="compress_passthrough" role="source"
                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
-                    <profile name="" format="dynamic"
-                             samplingRates="dynamic" channelMasks="dynamic"/>
                 </mixPort>
                 <mixPort name="direct_pcm" role="source"
                         flags="AUDIO_OUTPUT_FLAG_DIRECT">
@@ -181,7 +179,7 @@
                              channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
-                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
+                             channelMasks="AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_2,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
                 </mixPort>
                 <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
@@ -257,11 +255,11 @@
                 </devicePort>
                 <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
+                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
                 </devicePort>
                 <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
+                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
                 </devicePort>
                 <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -284,11 +282,11 @@
                 </devicePort>
                 <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
+                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>
                 </devicePort>
                 <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>
+                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>
                 </devicePort>
 
                 <!-- Input devices declaration, i.e. Source DEVICE PORT -->
diff --git a/audio/mixer_paths_lagoon_fp4.xml b/audio/mixer_paths_lagoon_fp4.xml
index 78bc735..285fb72 100644
--- a/audio/mixer_paths_lagoon_fp4.xml
+++ b/audio/mixer_paths_lagoon_fp4.xml
@@ -3686,7 +3686,16 @@
     </path>
 
     <path name="handset-stereo-dmic-ef">
-        <path name="handset-dmic-endfire" />
+        <ctl name="TX_CDC_DMA_TX_3 Channels" value="Two" />
+        <ctl name="TX DEC0 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX1" value="ADC0" />
+        <ctl name="TX_AIF1_CAP Mixer DEC0" value="1" />
+        <ctl name="ADC1_MIXER Switch" value="1" />
+        <ctl name="TX DEC1 MUX" value="SWR_MIC" />
+        <ctl name="TX SMIC MUX0" value="ADC1" />
+        <ctl name="TX_AIF1_CAP Mixer DEC1" value="1" />
+        <ctl name="ADC2_MIXER Switch" value="1" />
+        <ctl name="ADC2 MUX" value="INP3" />
     </path>
 
     <path name="speaker-stereo-dmic-ef">
diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index 699f935..4072750 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:
              <Limit name="blocks-per-second" min="36" max="48600" />
              <Limit name="bitrate" range="1-8000000" />
              <Limit name="frame-rate" range="1-30" />
+             <Attribute name="software-codec" />
              <Limit name="concurrent-instances" max="3" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
diff --git a/media/media_codecs_c2.xml b/media/media_codecs_c2.xml
index 3076916..769fff6 100644
--- a/media/media_codecs_c2.xml
+++ b/media/media_codecs_c2.xml
@@ -243,8 +243,8 @@
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
-            <Limit name="performance-point-1920x1080" value="120" />
-            <Limit name="performance-point-1280x720" value="240" />
+            <Limit name="performance-point-1920x1080" value="60" />
+            <Limit name="performance-point-1280x720" value="120" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" >
             <Quirk name="requires-allocate-on-input-ports" />
@@ -380,8 +380,8 @@
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
-            <Limit name="performance-point-1920x1080" value="120" />
-            <Limit name="performance-point-1280x720" value="240" />
+            <Limit name="performance-point-1920x1080" value="60" />
+            <Limit name="performance-point-1280x720" value="120" />
         </MediaCodec>
 
         <!-- OMX alias encoders (Codec2 encoders with OMX names) -->
diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml
index e4e44d4..dba2ce1 100644
--- a/media/media_codecs_performance.xml
+++ b/media/media_codecs_performance.xml
@@ -97,13 +97,13 @@ limitations under the License.
             <Limit name="measured-frame-rate-320x240" range="480-510" />
             <Limit name="measured-frame-rate-720x480" range="460-490" />
             <Limit name="measured-frame-rate-1280x720" range="350-400" />
-            <Limit name="measured-frame-rate-1920x1088" range="180-190" />
+            <Limit name="measured-frame-rate-1920x1088" range="160-190" />
         </MediaCodec>
             <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
             <Limit name="measured-frame-rate-352x288" range="510-530" />
             <Limit name="measured-frame-rate-720x480" range="465-620" />
             <Limit name="measured-frame-rate-1280x720" range="200-390" />
-            <Limit name="measured-frame-rate-1920x1080" range="210-230" />
+            <Limit name="measured-frame-rate-1920x1080" range="175-230" />
             <Limit name="measured-frame-rate-3840x2160" range="65-75" />
         </MediaCodec>
         <MediaCodec name="OMX.qti.video.decoder.h263sw" type="video/3gpp" update="true">
@@ -125,7 +125,7 @@ limitations under the License.
             <Limit name="measured-frame-rate-320x240" range="377-377" />
             <Limit name="measured-frame-rate-640x360" range="486-751" />
             <Limit name="measured-frame-rate-1280x720" range="262-262" />
-            <Limit name="measured-frame-rate-1920x1080" range="220-220" />
+            <Limit name="measured-frame-rate-1920x1080" range="180-220" />
             <Limit name="measured-frame-rate-3840x2160" range="51-51" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
@@ -183,6 +183,8 @@ limitations under the License.
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="374-542" />
+            <Limit name="measured-frame-rate-480x360" range="220-500" />
+            <Limit name="measured-frame-rate-1280x720" range="100-250" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="310-690" />
diff --git a/media/media_codecs_performance_c2.xml b/media/media_codecs_performance_c2.xml
index 2993d2f..a9a4592 100644
--- a/media/media_codecs_performance_c2.xml
+++ b/media/media_codecs_performance_c2.xml
@@ -132,6 +132,8 @@
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <!-- measured 90%:149-1332 med:379/360 FLAKY(109 - 958 < mx=1400.6) RG.VARIANCE:2.1 -->
             <Limit name="measured-frame-rate-176x144" range="450-850" /> <!-- N=272 v90%=3.0 -->
+            <Limit name="measured-frame-rate-480x360" range="220-500" />
+            <Limit name="measured-frame-rate-1280x720" range="100-250" />
         </MediaCodec>
     </Decoders>
 
diff --git a/media/media_codecs_performance_v1.xml b/media/media_codecs_performance_v1.xml
index d02b672..55db4df 100644
--- a/media/media_codecs_performance_v1.xml
+++ b/media/media_codecs_performance_v1.xml
@@ -183,6 +183,8 @@ limitations under the License.
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="240-640" />
+            <Limit name="measured-frame-rate-480x360" range="220-500" />
+            <Limit name="measured-frame-rate-1280x720" range="100-250" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="510-810" />
diff --git a/media/media_codecs_performance_v2.xml b/media/media_codecs_performance_v2.xml
index 043dc01..a042b33 100644
--- a/media/media_codecs_performance_v2.xml
+++ b/media/media_codecs_performance_v2.xml
@@ -171,6 +171,8 @@ limitations under the License.
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="500-1103" />
+            <Limit name="measured-frame-rate-480x360" range="220-500" />
+            <Limit name="measured-frame-rate-1280x720" range="100-250" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="310-690" />
diff --git a/media/media_codecs_performance_v3.xml b/media/media_codecs_performance_v3.xml
index da92aea..319156f 100644
--- a/media/media_codecs_performance_v3.xml
+++ b/media/media_codecs_performance_v3.xml
@@ -171,6 +171,8 @@ limitations under the License.
         </MediaCodec>
         <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
             <Limit name="measured-frame-rate-176x144" range="500-1103" />
+            <Limit name="measured-frame-rate-480x360" range="220-500" />
+            <Limit name="measured-frame-rate-1280x720" range="100-250" />
         </MediaCodec>
         <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
             <Limit name="measured-frame-rate-320x180" range="310-690" />
diff --git a/media/media_codecs_vendor.xml b/media/media_codecs_vendor.xml
index 705f3cd..20ec969 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:
              <Limit name="blocks-per-second" min="36" max="48600" />
              <Limit name="bitrate" range="1-8000000" />
              <Limit name="frame-rate" range="1-30" />
+             <Attribute name="software-codec" />
              <Limit name="concurrent-instances" max="3" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
diff --git a/media/media_codecs_vendor_v2.xml b/media/media_codecs_vendor_v2.xml
index 689bcd0..d8309ff 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:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Limit name="concurrent-instances" max="16" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
@@ -158,6 +159,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="concurrent-instances" max="16" />
             <Limit name="quality" range="0-100" default="80" />
             <Feature name="bitrate-modes" value="VBR,CBR" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
@@ -199,6 +201,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-2000000" />
             <Limit name="frame-rate" range="1-30" />
             <Limit name="concurrent-instances" max="3" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
@@ -211,7 +214,9 @@ Only the three quirks included above are recognized at this point:
              <Limit name="blocks-per-second" min="36" max="48600" />
              <Limit name="bitrate" range="1-8000000" />
              <Limit name="frame-rate" range="1-30" />
+             <Attribute name="software-codec" />
              <Limit name="concurrent-instances" max="3" />
+             <Feature name="can-swap-width-height" required="true" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
     </Encoders>
@@ -227,6 +232,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-480" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2160" value="48" />
             <Limit name="performance-point-3840x2160" value="60" />
@@ -243,6 +249,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2160" value="48" />
@@ -258,6 +265,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
@@ -271,6 +279,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-1920x1080" value="30" />
@@ -285,6 +294,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-480" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="6" />
             <Limit name="performance-point-4096x2160" value="48" />
             <Limit name="performance-point-3840x2160" value="60" />
@@ -301,6 +311,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2160" value="48" />
@@ -316,6 +327,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-480" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2160" value="48" />
             <Limit name="performance-point-3840x2160" value="60" />
@@ -332,6 +344,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2160" value="48" />
@@ -348,6 +361,7 @@ Only the three quirks included above are recognized at this point:
              <Limit name="bitrate" range="1-16000000" />
              <Limit name="frame-rate" range="1-30" />
              <Feature name="adaptive-playback" />
+             <Feature name="can-swap-width-height" required="true" />
              <Limit name="concurrent-instances" max="4" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
@@ -361,6 +375,7 @@ Only the three quirks included above are recognized at this point:
              <Limit name="bitrate" range="1-40000000" />
              <Limit name="frame-rate" range="1-30" />
              <Limit name="concurrent-instances" max="4" />
+             <Feature name="can-swap-width-height" required="true" />
              <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
     </Decoders>
diff --git a/media/media_codecs_vendor_v3.xml b/media/media_codecs_vendor_v3.xml
index 21815f3..552b799 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:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Limit name="concurrent-instances" max="16" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
@@ -158,6 +159,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="concurrent-instances" max="16" />
             <Limit name="quality" range="0-100" default="80" />
             <Feature name="bitrate-modes" value="VBR,CBR" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
             <Limit name="performance-point-1920x1080" value="120" />
@@ -199,6 +201,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-2000000" />
             <Limit name="frame-rate" range="1-30" />
             <Limit name="concurrent-instances" max="3" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
@@ -211,7 +214,9 @@ Only the three quirks included above are recognized at this point:
              <Limit name="blocks-per-second" min="36" max="48600" />
              <Limit name="bitrate" range="1-8000000" />
              <Limit name="frame-rate" range="1-30" />
+             <Attribute name="software-codec" />
              <Limit name="concurrent-instances" max="3" />
+             <Feature name="can-swap-width-height" required="true" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
     </Encoders>
@@ -227,6 +232,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
@@ -243,6 +249,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2160" value="24" />
@@ -259,6 +266,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
@@ -272,6 +280,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-30" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-1920x1080" value="30" />
@@ -286,6 +295,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="6" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
@@ -302,6 +312,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2160" value="24" />
@@ -318,6 +329,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-100000000" />
             <Limit name="frame-rate" range="1-240" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Limit name="concurrent-instances" max="16" />
             <Limit name="performance-point-4096x2160" value="24" />
             <Limit name="performance-point-3840x2160" value="30" />
@@ -334,6 +346,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Limit name="frame-rate" range="1-60" />
             <Feature name="adaptive-playback" />
+            <Feature name="can-swap-width-height" required="true" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="3" />
             <Limit name="performance-point-4096x2160" value="24" />
@@ -351,6 +364,7 @@ Only the three quirks included above are recognized at this point:
              <Limit name="bitrate" range="1-16000000" />
              <Limit name="frame-rate" range="1-30" />
              <Feature name="adaptive-playback" />
+             <Feature name="can-swap-width-height" required="true" />
              <Limit name="concurrent-instances" max="4" />
              <Limit name="performance-point-720x480" value="30" />
         </MediaCodec>
@@ -364,6 +378,7 @@ Only the three quirks included above are recognized at this point:
              <Limit name="bitrate" range="1-40000000" />
              <Limit name="frame-rate" range="1-30" />
              <Limit name="concurrent-instances" max="4" />
+             <Feature name="can-swap-width-height" required="true" />
              <Limit name="performance-point-1920x1080" value="30" />
         </MediaCodec>
     </Decoders>
diff --git a/media/media_profiles_vendor.xml b/media/media_profiles_vendor.xml
index 2fd1f9b..a4df3d8 100644
--- a/media/media_profiles_vendor.xml
+++ b/media/media_profiles_vendor.xml
@@ -186,7 +186,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
+    <!-- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -197,7 +197,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>
+    </EncoderProfile> -->
 
     <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -365,7 +365,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
+    <!-- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -376,7 +376,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>
+    </EncoderProfile> -->
 
     <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -999,7 +999,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
+    <!-- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -1010,7 +1010,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>
+    </EncoderProfile> -->
 
     <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -1178,7 +1178,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
+    <!-- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -1189,7 +1189,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>
+    </EncoderProfile> -->
 
     <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -1305,7 +1305,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
+    <!-- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -1316,7 +1316,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>
+    </EncoderProfile> -->
 
     <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -1484,7 +1484,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
+    <!-- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -1495,7 +1495,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>
+    </EncoderProfile> -->
 
     <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -1611,7 +1611,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
+    <!-- <EncoderProfile quality="4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -1622,7 +1622,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>
+    </EncoderProfile> -->
 
     <EncoderProfile quality="2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
@@ -1790,7 +1790,7 @@
              channels="2" />
     </EncoderProfile>
 
-    <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
+    <!-- <EncoderProfile quality="timelapse4kdci" fileFormat="mp4" duration="30">
       <Video codec="h264"
             bitRate="42000000"
             width="4096"
@@ -1801,7 +1801,7 @@
             bitRate="156000"
             sampleRate="48000"
             channels="2" />
-    </EncoderProfile>
+    </EncoderProfile> -->
 
     <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30">
       <Video codec="h264"
-- 
GitLab


From fc9d96b9a557e1646606693421834fed9d63f738 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Fri, 25 Nov 2022 10:02:59 +0530
Subject: [PATCH 05/30] FP4: Bump FCM from FP4.SP1Y.B.041.20230109

---
 framework_compatibility_matrix.xml | 189 +++++++++++++++++++++++++++--
 1 file changed, 178 insertions(+), 11 deletions(-)

diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index 5aed642..92f4a35 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -1,12 +1,11 @@
-<compatibility-matrix version="2.0" type="framework">
+<compatibility-matrix version="4.0" type="framework">
     <hal format="hidl" optional="true">
         <name>android.hardware.automotive.evs</name>
         <version>1.1</version>
         <interface>
             <name>IEvsEnumerator</name>
-            <instance>EvsEnumeratorHw</instance>
-            <instance>EvsEnumeratorHw-Mock</instance>
             <instance>default</instance>
+            <instance>hw/1</instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">
@@ -131,7 +130,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.display.color</name>
-        <version>1.0-6</version>
+        <version>1.0-7</version>
         <interface>
             <name>IDisplayColor</name>
             <instance>default</instance>
@@ -162,6 +161,23 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.nxp.hardware.nfc</name>
+        <version>1.0-1</version>
+        <version>2.0</version>
+        <interface>
+            <name>INqNfc</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.nxp.nxpnfclegacy</name>
+        <version>1.0</version>
+        <interface>
+            <name>INxpNfcLegacy</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.pixelworks.hardware.display</name>
         <version>1.1</version>
@@ -189,7 +205,7 @@
     <hal format="hidl" optional="true">
         <name>vendor.qti.data.factory</name>
         <version>1.0</version>
-        <version>2.0-3</version>
+        <version>2.0-5</version>
         <interface>
             <name>IFactory</name>
             <instance>default</instance>
@@ -203,6 +219,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.dvr</name>
+        <version>1.0</version>
+        <interface>
+            <name>IDvrDisplay</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.esepowermanager</name>
         <version>1.0-1</version>
@@ -222,6 +246,13 @@
             <instance>gnss_vendor</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.gnss</name>
+        <interface>
+            <name>ILocAidlGnss</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.AGMIPC</name>
         <version>1.0</version>
@@ -230,6 +261,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.ListenSoundModel</name>
+        <version>1.0</version>
+        <interface>
+            <name>IListenSoundModel</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.alarm</name>
         <version>1.0</version>
@@ -271,6 +310,22 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.cacert</name>
+        <version>1.0</version>
+        <interface>
+            <name>IService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.camera.aon</name>
+        <version>1.0-1</version>
+        <interface>
+            <name>IAONService</name>
+            <instance>aoncameraservice</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.camera.postproc</name>
         <version>1.0</version>
@@ -312,9 +367,17 @@
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.data.connectionfactory</name>
+        <interface>
+            <name>IFactory</name>
+            <instance>slot0</instance>
+            <instance>slot1</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.data.iwlan</name>
-        <version>1.0</version>
+        <version>1.0-1</version>
         <interface>
             <name>IIWlan</name>
             <instance>slot1</instance>
@@ -351,11 +414,20 @@
         <name>vendor.qti.hardware.display.composer</name>
         <version>2.0-1</version>
         <version>3.0</version>
+        <version>3.1</version>
         <interface>
             <name>IQtiComposer</name>
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.display.config</name>
+        <version>1-5</version>
+        <interface>
+            <name>IDisplayConfig</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.display.demura</name>
         <version>1.0</version>
@@ -375,6 +447,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.dpmservice</name>
+        <version>1.0-1</version>
+        <interface>
+            <name>IDpmService</name>
+            <instance>DpmService</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.dsp</name>
         <version>1.0</version>
@@ -465,7 +545,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.limits</name>
-        <version>1.0</version>
+        <version>1.0-1</version>
         <interface>
             <name>ILimits</name>
             <instance>default</instance>
@@ -489,15 +569,23 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.perf</name>
-        <version>2.0-2</version>
+        <version>2.0-3</version>
         <interface>
             <name>IPerf</name>
             <instance>default</instance>
         </interface>
     </hal>
     <hal format="hidl" optional="true">
-        <name>vendor.qti.hardware.qccsyshal</name>
+        <name>vendor.qti.hardware.power.powermodule</name>
         <version>1.0</version>
+        <interface>
+            <name>IPowerModule</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.qccsyshal</name>
+        <version>1.0-1</version>
         <interface>
             <name>IQccsyshal</name>
             <instance>qccsyshal</instance>
@@ -547,6 +635,41 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRCoreService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRCamService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRSplitService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRModService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.qxr</name>
+        <interface>
+            <name>IQXRAudioService</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.am</name>
         <version>1.0</version>
@@ -556,9 +679,26 @@
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.am</name>
+        <interface>
+            <name>IQcRilAudio</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.ims</name>
-        <version>1.0-7</version>
+        <version>1.0-8</version>
+        <interface>
+            <name>IImsRadio</name>
+            <instance>imsradio0</instance>
+            <instance>imsradio1</instance>
+        </interface>
+    </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.ims</name>
+        <version>1-6</version>
         <interface>
             <name>IImsRadio</name>
             <instance>imsradio0</instance>
@@ -575,7 +715,7 @@
     </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.lpa</name>
-        <version>1.0-1</version>
+        <version>1.0-2</version>
         <interface>
             <name>IUimLpa</name>
             <instance>UimLpa0</instance>
@@ -601,6 +741,15 @@
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal format="aidl" optional="true">
+        <name>vendor.qti.hardware.radio.qtiradio</name>
+        <version>1-5</version>
+        <interface>
+            <name>IQtiRadioStable</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.radio.uim</name>
         <version>1.1-2</version>
@@ -764,6 +913,14 @@
             <instance>default</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.hardware.wifi.wificfr</name>
+        <version>1.0</version>
+        <interface>
+            <name>IWificfr</name>
+            <instance>wificfr</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.hardware.wifi.wifilearner</name>
         <version>1.0</version>
@@ -835,6 +992,7 @@
     <hal format="hidl" optional="true">
         <name>vendor.qti.ims.factory</name>
         <version>1.0-1</version>
+        <version>2.0-1</version>
         <interface>
             <name>IImsFactory</name>
             <instance>default</instance>
@@ -856,6 +1014,14 @@
             <instance>pasrhal</instance>
         </interface>
     </hal>
+    <hal format="hidl" optional="true">
+        <name>vendor.qti.mstatservice</name>
+        <version>1.0</version>
+        <interface>
+            <name>IMStatService</name>
+            <instance>mstatservice</instance>
+        </interface>
+    </hal>
     <hal format="hidl" optional="true">
         <name>vendor.qti.power.pasrmanager</name>
         <version>1.0</version>
@@ -883,6 +1049,7 @@
     <hal format="hidl" optional="true">
         <name>vendor.qti.spu</name>
         <version>1.0-1</version>
+        <version>2.0</version>
         <interface>
             <name>ISPUManager</name>
             <instance>default</instance>
-- 
GitLab


From 2c31d4f57cf52afb7e2f0ee5dd0ff679cd271521 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Fri, 25 Nov 2022 10:02:59 +0530
Subject: [PATCH 06/30] FP4: Bump WifiOverlay from FP4.SP1Y.B.041.20230109

---
 rro_overlays/WifiOverlay/res/values/config.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index e3ec0fe..e0435a6 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -39,7 +39,7 @@
     <bool translatable="false" name="config_wifi_p2p_mac_randomization_supported">true</bool>
 
     <!-- Wifi driver supports Automatic channel selection (ACS) for softap -->
-    <bool translatable="false" name="config_wifi_softap_acs_supported">true</bool>
+    <bool translatable="false" name="config_wifi_softap_acs_supported">false</bool>
 
     <!-- Wifi driver supports IEEE80211AC for softap -->
     <bool translatable="false" name="config_wifi_softap_ieee80211ac_supported">true</bool>
@@ -58,6 +58,12 @@
          range string like '1-6,11'. -->
     <string  translatable="false" name="config_wifiSoftap2gChannelList"></string>
 
+    <!-- Enable Aware NDP interface selection on interface that already has network set up.
+     Note: the default AOSP Android does not support multiple networks on the same Aware NDI.
+     Enabling this configuration will restore legacy behavior but may result in incorrect behavior.
+     -->
+    <bool name="config_wifiAllowMultipleNetworksOnSameAwareNdi">true</bool>
+
     <!-- Do not translate. Default access point SSID used for tethering -->
     <string name="wifi_tether_configure_ssid_default" translatable="false">Fairphone 4 5G</string>
 </resources>
-- 
GitLab


From 6493656c34a91b48e8e8eb5d308802188388c3dc Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Sat, 19 Mar 2022 22:09:33 +0800
Subject: [PATCH 07/30] FP4: Add QTI GbaService implementation

Change-Id: I0fd5f8c4ed02003186d4bf54d473d8301b13c0e1
---
 overlay/packages/services/Telephony/res/values/config.xml | 3 +++
 proprietary-files.txt                                     | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index 907d533..c472daa 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -34,6 +34,9 @@
     <!-- Show RTT option in Accessibility menu -->
     <bool name="config_support_rtt">true</bool>
 
+    <!-- String indicating the package name of the device GbaService implementation. -->
+    <string name="config_gba_package">com.qualcomm.qti.uimGbaApp</string>
+
     <!-- String indicating the package name of the device ImsService implementation for MMTEL -->
     <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
 
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f0733c9..d7544bb 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -845,6 +845,11 @@ vendor/lib64/libqmi_encdec.so
 vendor/lib64/libqmiservices.so
 
 # RIL
+-product/app/uimgbaservice/uimgbaservice.apk
+product/etc/permissions/UimGba.xml
+product/etc/permissions/UimGbaManager.xml
+product/framework/uimgbalibrary.jar
+product/framework/uimgbamanagerlibrary.jar
 -system_ext/app/QtiTelephonyService/QtiTelephonyService.apk
 system_ext/etc/permissions/qcrilhook.xml
 system_ext/etc/permissions/qti_libpermissions.xml
-- 
GitLab


From d2bf03039e8e4fccbb772f63bd3416c7aad99b24 Mon Sep 17 00:00:00 2001
From: dianlujitao <dianlujitao@lineageos.org>
Date: Sat, 19 Mar 2022 21:59:08 +0800
Subject: [PATCH 08/30] FP4: Add QTI ImsRcsService

Change-Id: I22bcc7504e350a7b3c990cf5a6449b90b66b66e6
---
 overlay/packages/services/Telephony/res/values/config.xml | 2 +-
 proprietary-files.txt                                     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index c472daa..ecf2f56 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -41,7 +41,7 @@
     <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
 
     <!-- String indicating the package name of the device ImsService implementation for RCS -->
-    <string name="config_ims_rcs_package">org.codeaurora.ims</string>
+    <string name="config_ims_rcs_package">vendor.qti.imsrcs</string>
 
     <!-- Package name for the call-based number verification app -->
     <string name="platform_number_verification_package" translatable="false">com.google.android.gms</string>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index d7544bb..d5bb4df 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -546,6 +546,13 @@ vendor/firmware/iris6_ccf2.fw
 vendor/firmware/iris6_ccf3.fw
 
 # IMS
+-system_ext/app/ImsRcsService/ImsRcsService.apk
+system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
+system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar
+system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar
+system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar
+system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar
+system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar
 system_ext/lib64/lib-imsvideocodec.so
 system_ext/lib64/lib-imsvt.so
 system_ext/lib64/lib-imsvtextutils.so
-- 
GitLab


From b7defe5c7ad4ea88a74fa6153961eebab26f0835 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Thu, 17 Nov 2022 21:05:16 +0530
Subject: [PATCH 09/30] FP4: Bump rootdir scripts from CAF

Tag: LA.UM.9.12.r1-13800.02-SMxx50.QSSI12.0
---
 rootdir/bin/init.qcom.early_boot.sh |  15 +-
 rootdir/bin/init.qcom.post_boot.sh  | 543 ++++++++++++++++++----------
 rootdir/etc/init.qcom.rc            |   7 +-
 rootdir/etc/init.target.rc          |   2 +
 rootdir/etc/ueventd.qcom.rc         |  27 +-
 5 files changed, 372 insertions(+), 222 deletions(-)
 mode change 100644 => 100755 rootdir/etc/init.qcom.rc

diff --git a/rootdir/bin/init.qcom.early_boot.sh b/rootdir/bin/init.qcom.early_boot.sh
index 891e816..9fdcdd3 100644
--- a/rootdir/bin/init.qcom.early_boot.sh
+++ b/rootdir/bin/init.qcom.early_boot.sh
@@ -1,6 +1,6 @@
 #! /vendor/bin/sh
 
-# Copyright (c) 2012-2013,2016,2018-2020 The Linux Foundation. All rights reserved.
+# Copyright (c) 2012-2013,2016,2018-2021 The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -255,6 +255,9 @@ case "$target" in
         # 196610 is decimal for 0x30002 to report version 3.2
         case "$soc_hwid" in
             294|295|296|297|298|313|353|354|363|364)
+                # Disable adsprpcd_sensorspd daemon
+                setprop vendor.fastrpc.disable.adsprpcd_sensorspd.daemon 1
+
                 setprop vendor.opengles.version 196610
                 if [ $soc_hwid = 354 ]
                 then
@@ -367,6 +370,8 @@ case "$target" in
                 setprop vendor.display.enhance_idle_time 1
                 setprop vendor.netflix.bsp_rev ""
                 ;;
+             518)
+                ;;
             *)
                 # default case is for bengal
                 setprop vendor.netflix.bsp_rev "Q6115-31409-1"
@@ -492,6 +497,14 @@ case "$product" in
         *)
         ;;
 esac
+
+case "$product" in
+        "msmnile_gvmgh")
+         setprop vendor.display.lcd_density 160
+         ;;
+        *)
+        ;;
+esac
 # Setup display nodes & permissions
 # HDMI can be fb1 or fb2
 # Loop through the sysfs nodes and determine
diff --git a/rootdir/bin/init.qcom.post_boot.sh b/rootdir/bin/init.qcom.post_boot.sh
index 4351649..ed77d94 100644
--- a/rootdir/bin/init.qcom.post_boot.sh
+++ b/rootdir/bin/init.qcom.post_boot.sh
@@ -64,8 +64,17 @@ function 8953_sched_dcvs_eas()
             for cpubw in $device/*cpu-cpu-ddr-bw/devfreq/*cpu-cpu-ddr-bw
             do
                 echo "bw_hwmon" > $cpubw/governor
-                echo 85 > $cpubw/bw_hwmon/io_percent
+                echo 34 > $cpubw/bw_hwmon/io_percent
                 echo 0 > $cpubw/bw_hwmon/guard_band_mbps
+                echo 20 > $cpubw/bw_hwmon/hist_memory
+                echo 10 > $cpubw/bw_hwmon/hyst_length
+                echo 1600 > $cpubw/bw_hwmon/idle_mbps
+                echo 20 > $cpubw/bw_hwmon/low_power_delay
+                echo 34 > $cpubw/bw_hwmon/low_power_io_percent
+                echo "1611 3221 5859 6445 7104" > $cpubw/bw_hwmon/mbps_zones
+                echo 4 > $cpubw/bw_hwmon/sample_ms
+                echo 250 > $cpubw/bw_hwmon/up_scale
+                echo 1611 > $cpubw/min_freq
             done
         done
     else
@@ -117,8 +126,8 @@ function 8917_sched_dcvs_eas()
             for cpubw in $device/*cpu-cpu-ddr-bw/devfreq/*cpu-cpu-ddr-bw
             do
                 echo "bw_hwmon" > $cpubw/governor
-                echo 85 > $cpubw/bw_hwmon/io_percent
-                echo 0 > $cpubw/bw_hwmon/guard_band_mbps
+                echo 20 > $cpubw/bw_hwmon/io_percent
+                echo 30 > $cpubw/bw_hwmon/guard_band_mbps
             done
         done
     else
@@ -191,8 +200,8 @@ function 8937_sched_dcvs_eas()
             for cpubw in $device/*cpu-cpu-ddr-bw/devfreq/*cpu-cpu-ddr-bw
             do
                 echo "bw_hwmon" > $cpubw/governor
-                echo 85 > $cpubw/bw_hwmon/io_percent
-                echo 0 > $cpubw/bw_hwmon/guard_band_mbps
+                echo 20 > $cpubw/bw_hwmon/io_percent
+                echo 30 > $cpubw/bw_hwmon/guard_band_mbps
             done
         done
     else
@@ -905,6 +914,13 @@ function enable_swap() {
     fi
 }
 
+function disable_ppr()
+{
+   if [ -f  /sys/module/process_reclaim/parameters/enable_process_reclaim ]; then
+       echo 0 > /sys/module/process_reclaim/parameters/enable_process_reclaim
+   fi
+}
+
 function configure_memory_parameters() {
     # Set Memory parameters.
     #
@@ -2414,6 +2430,10 @@ case "$target" in
 
                 # Set Memory parameters
                 configure_memory_parameters
+
+                if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 19 ]; then
+                    disable_ppr
+                fi
             ;;
         esac
         case "$soc_id" in
@@ -2687,6 +2707,10 @@ case "$target" in
                 echo 1 > /proc/sys/kernel/power_aware_timer_migration
                 # Set Memory parameters
                 configure_memory_parameters
+
+                if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 19 ]; then
+                    disable_ppr
+                fi
                 ;;
                 *)
                 ;;
@@ -2712,28 +2736,30 @@ case "$target" in
                 #disable sched_boost in 8937
                 echo 0 > /proc/sys/kernel/sched_boost
 
-                for devfreq_gov in /sys/class/devfreq/qcom,mincpubw*/governor
-                do
-                    echo "cpufreq" > $devfreq_gov
-                done
-
-                for devfreq_gov in /sys/class/devfreq/soc:qcom,cpubw/governor
-                do
-                    echo "bw_hwmon" > $devfreq_gov
-                    for cpu_io_percent in /sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/io_percent
+                if [ $KernelVersionA -le 4 ] && [ $KernelVersionB -le 9 ]; then
+                    for devfreq_gov in /sys/class/devfreq/qcom,mincpubw*/governor
                     do
-                        echo 20 > $cpu_io_percent
+                        echo "cpufreq" > $devfreq_gov
                     done
-                for cpu_guard_band in /sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/guard_band_mbps
+
+                    for devfreq_gov in /sys/class/devfreq/soc:qcom,cpubw/governor
                     do
-                        echo 30 > $cpu_guard_band
+                        echo "bw_hwmon" > $devfreq_gov
+                        for cpu_io_percent in /sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/io_percent
+                        do
+                            echo 20 > $cpu_io_percent
+                        done
+                    for cpu_guard_band in /sys/class/devfreq/soc:qcom,cpubw/bw_hwmon/guard_band_mbps
+                        do
+                            echo 30 > $cpu_guard_band
+                        done
                     done
-                done
 
-                for gpu_bimc_io_percent in /sys/class/devfreq/soc:qcom,gpubw/bw_hwmon/io_percent
-                do
-                    echo 40 > $gpu_bimc_io_percent
-                done
+                    for gpu_bimc_io_percent in /sys/class/devfreq/soc:qcom,gpubw/bw_hwmon/io_percent
+                    do
+                        echo 40 > $gpu_bimc_io_percent
+                    done
+                fi
 
                 # disable thermal core_control to update interactive gov and core_ctl settings
                 echo 0 > /sys/module/msm_thermal/core_control/enabled
@@ -2784,6 +2810,9 @@ case "$target" in
                 echo 1 > /proc/sys/kernel/power_aware_timer_migration
                 # Set Memory parameters
                 configure_memory_parameters
+                if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 19 ]; then
+                    disable_ppr
+                fi
             ;;
             *)
 
@@ -2808,8 +2837,8 @@ case "$target" in
                         for cpubw in $device/*cpu-cpu-ddr-bw/devfreq/*cpu-cpu-ddr-bw
                         do
                             echo "bw_hwmon" > $cpubw/governor
-                            echo 85 > $cpubw/bw_hwmon/io_percent
-                            echo 0 > $cpubw/bw_hwmon/guard_band_mbps
+                            echo 20 > $cpubw/bw_hwmon/io_percent
+                            echo 30 > $cpubw/bw_hwmon/guard_band_mbps
                         done
                     done
                 else
@@ -2991,6 +3020,10 @@ case "$target" in
                 # Set Memory parameters
                 configure_memory_parameters
 
+                if [ $KernelVersionA -ge 4 ] && [ $KernelVersionB -ge 19 ]; then
+                    disable_ppr
+                fi
+
                 #disable sched_boost
                 echo 0 > /proc/sys/kernel/sched_boost
 
@@ -3420,7 +3453,7 @@ case "$target" in
         fi
 
         case "$soc_id" in
-                 "394" )
+                 "394" | "467" | "468" )
 
             # Core control parameters on big
             echo 2 > /sys/devices/system/cpu/cpu4/core_ctl/min_cpus
@@ -4221,6 +4254,109 @@ case "$target" in
             ;;
         esac
 
+        #power/perf tunings for khaje
+        case "$soc_id" in
+                 "518" )
+
+            # Core control parameters on big
+            echo 0 > /sys/devices/system/cpu/cpu0/core_ctl/enable
+            echo 2 > /sys/devices/system/cpu/cpu4/core_ctl/min_cpus
+            echo 40 > /sys/devices/system/cpu/cpu4/core_ctl/busy_down_thres
+            echo 60 > /sys/devices/system/cpu/cpu4/core_ctl/busy_up_thres
+            echo 100 > /sys/devices/system/cpu/cpu4/core_ctl/offline_delay_ms
+            echo 4 > /sys/devices/system/cpu/cpu4/core_ctl/task_thres
+
+            # Setting b.L scheduler parameters
+            echo 65 > /proc/sys/kernel/sched_downmigrate
+            echo 71 > /proc/sys/kernel/sched_upmigrate
+            echo 85 > /proc/sys/kernel/sched_group_downmigrate
+            echo 100 > /proc/sys/kernel/sched_group_upmigrate
+
+            # cpuset settings
+            echo 0-3 > /dev/cpuset/background/cpus
+            echo 0-3 > /dev/cpuset/system-background/cpus
+
+
+            # configure governor settings for little cluster
+            echo "schedutil" > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+            echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/up_rate_limit_us
+            echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/down_rate_limit_us
+            echo 1516800 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_freq
+            echo 691200 > /sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq
+            echo 0 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/rtg_boost_freq
+
+            # configure governor settings for big cluster
+            echo "schedutil" > /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor
+            echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/up_rate_limit_us
+            echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/down_rate_limit_us
+            echo 1344000 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_freq
+            echo 1056000 > /sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq
+            echo 0 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/rtg_boost_freq
+
+            echo "0:1190000" > /sys/devices/system/cpu/cpu_boost/input_boost_freq
+            echo 80 > /sys/devices/system/cpu/cpu_boost/input_boost_ms
+
+	    echo 1 > /proc/sys/kernel/sched_walt_rotate_big_tasks
+
+            # sched_load_boost as -6 is equivalent to target load as 85. It is per cpu tunable.
+            echo -6 >  /sys/devices/system/cpu/cpu0/sched_load_boost
+            echo -6 >  /sys/devices/system/cpu/cpu1/sched_load_boost
+            echo -6 >  /sys/devices/system/cpu/cpu2/sched_load_boost
+            echo -6 >  /sys/devices/system/cpu/cpu3/sched_load_boost
+            echo -6 >  /sys/devices/system/cpu/cpu4/sched_load_boost
+            echo -6 >  /sys/devices/system/cpu/cpu5/sched_load_boost
+            echo -6 >  /sys/devices/system/cpu/cpu6/sched_load_boost
+            echo -6 >  /sys/devices/system/cpu/cpu7/sched_load_boost
+            echo 85 > /sys/devices/system/cpu/cpu0/cpufreq/schedutil/hispeed_load
+            echo 85 > /sys/devices/system/cpu/cpu4/cpufreq/schedutil/hispeed_load
+
+            # Set Memory parameters
+            configure_memory_parameters
+
+            # Enable bus-dcvs
+
+            for device in /sys/devices/platform/soc
+            do
+                for cpubw in $device/*cpu-cpu-ddr-bw/devfreq/*cpu-cpu-ddr-bw
+                do
+                    echo "bw_hwmon" > $cpubw/governor
+                    echo 50 > $cpubw/polling_interval
+                    echo 762 > $cpubw/min_freq
+                    echo "2288 3440 4173 5195 5859 7759 10322 11863 13763 15960" > $cpubw/bw_hwmon/mbps_zones
+                    echo 85 > $cpubw/bw_hwmon/io_percent
+                    echo 4 > $cpubw/bw_hwmon/sample_ms
+                    echo 90 > $cpubw/bw_hwmon/decay_rate
+                    echo 190 > $cpubw/bw_hwmon/bw_step
+                    echo 20 > $cpubw/bw_hwmon/hist_memory
+                    echo 0 > $cpubw/bw_hwmon/hyst_length
+                    echo 80 > $cpubw/bw_hwmon/down_thres
+                    echo 0 > $cpubw/bw_hwmon/guard_band_mbps
+                    echo 250 > $cpubw/bw_hwmon/up_scale
+                   echo 1600 > $cpubw/bw_hwmon/idle_mbps
+                done
+
+            done
+            # memlat specific settings are moved to seperate file under
+            # device/target specific folder
+            setprop vendor.dcvs.prop 1
+
+            # colcoation v3 disabled
+            echo 0 > /proc/sys/kernel/sched_min_task_util_for_boost
+            echo 0 > /proc/sys/kernel/sched_min_task_util_for_colocation
+
+            # Turn off scheduler boost at the end
+            echo 0 > /proc/sys/kernel/sched_boost
+
+	    echo N > /sys/module/lpm_levels/system/pwr/pwr-l2-gdhs/idle_enabled
+	    echo N > /sys/module/lpm_levels/system/perf/perf-l2-gdhs/idle_enabled
+	    echo N > /sys/module/lpm_levels/system/pwr/pwr-l2-gdhs/suspend_enabled
+            echo N > /sys/module/lpm_levels/system/perf/perf-l2-gdhs/suspend_enabled
+            # Turn on sleep modes
+            echo 0 > /sys/module/lpm_levels/parameters/sleep_disabled
+
+            ;;
+        esac
+
         # Scuba perf/power tunings
         case "$soc_id" in
              "441" | "471" | "473" | "474" )
@@ -5092,186 +5228,205 @@ esac
 
 case "$target" in
     "msmnile")
-	# Core control parameters for gold
-	echo 2 > /sys/devices/system/cpu/cpu4/core_ctl/min_cpus
-	echo 60 > /sys/devices/system/cpu/cpu4/core_ctl/busy_up_thres
-	echo 30 > /sys/devices/system/cpu/cpu4/core_ctl/busy_down_thres
-	echo 100 > /sys/devices/system/cpu/cpu4/core_ctl/offline_delay_ms
-	echo 3 > /sys/devices/system/cpu/cpu4/core_ctl/task_thres
-
-	# Core control parameters for gold+
-	echo 0 > /sys/devices/system/cpu/cpu7/core_ctl/min_cpus
-	echo 60 > /sys/devices/system/cpu/cpu7/core_ctl/busy_up_thres
-	echo 30 > /sys/devices/system/cpu/cpu7/core_ctl/busy_down_thres
-	echo 100 > /sys/devices/system/cpu/cpu7/core_ctl/offline_delay_ms
-	echo 1 > /sys/devices/system/cpu/cpu7/core_ctl/task_thres
-	# Controls how many more tasks should be eligible to run on gold CPUs
-	# w.r.t number of gold CPUs available to trigger assist (max number of
-	# tasks eligible to run on previous cluster minus number of CPUs in
-	# the previous cluster).
-	#
-	# Setting to 1 by default which means there should be at least
-	# 4 tasks eligible to run on gold cluster (tasks running on gold cores
-	# plus misfit tasks on silver cores) to trigger assitance from gold+.
-	echo 1 > /sys/devices/system/cpu/cpu7/core_ctl/nr_prev_assist_thresh
-
-	# Disable Core control on silver
-	echo 0 > /sys/devices/system/cpu/cpu0/core_ctl/enable
-
-	# Setting b.L scheduler parameters
-	echo 95 95 > /proc/sys/kernel/sched_upmigrate
-	echo 85 85 > /proc/sys/kernel/sched_downmigrate
-	echo 100 > /proc/sys/kernel/sched_group_upmigrate
-	echo 10 > /proc/sys/kernel/sched_group_downmigrate
-	echo 1 > /proc/sys/kernel/sched_walt_rotate_big_tasks
-
 	# cpuset parameters
-	echo 0-3 > /dev/cpuset/background/cpus
-	echo 0-3 > /dev/cpuset/system-background/cpus
-
-	# Turn off scheduler boost at the end
-	echo 0 > /proc/sys/kernel/sched_boost
-
-	# configure governor settings for silver cluster
-	echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy0/scaling_governor
-	echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/up_rate_limit_us
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/down_rate_limit_us
-	echo 1209600 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/hispeed_freq
-	echo 576000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
-	echo 1 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/pl
+	target_varient=`getprop ro.build.product`
+        if [ "$target_varient" == "msmnile_gvmq" ]; then
+		echo 4-7 > /dev/cpuset/background/cpus
+		echo 4-7 > /dev/cpuset/system-background/cpus
+
+        	# Enable oom_reaper
+		if [ -f /sys/module/lowmemorykiller/parameters/oom_reaper ]; then
+			echo 1 > /sys/module/lowmemorykiller/parameters/oom_reaper
+		else
+			echo 1 > /proc/sys/vm/reap_mem_on_sigkill
+		fi
+		# Disable wsf, beacause we are using efk.
+		# wsf Range : 1..1000 So set to bare minimum value 1.
+	        echo 1 > /proc/sys/vm/watermark_scale_factor
+
+		# Disable wsf, beacause we are using efk.
+		# wsf Range : 1..1000 So set to bare minimum value 1.
+		echo 1 > /proc/sys/vm/watermark_scale_factor
+		# Enable oom_reaper
+		echo 1 > /proc/sys/vm/reap_mem_on_sigkill
 
-	# configure governor settings for gold cluster
-	echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy4/scaling_governor
-	echo 0 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/up_rate_limit_us
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/down_rate_limit_us
-	echo 1612800 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/hispeed_freq
-	echo 1 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/pl
+	else
+		# Core control parameters for gold
+		echo 2 > /sys/devices/system/cpu/cpu4/core_ctl/min_cpus
+		echo 60 > /sys/devices/system/cpu/cpu4/core_ctl/busy_up_thres
+		echo 30 > /sys/devices/system/cpu/cpu4/core_ctl/busy_down_thres
+		echo 100 > /sys/devices/system/cpu/cpu4/core_ctl/offline_delay_ms
+		echo 3 > /sys/devices/system/cpu/cpu4/core_ctl/task_thres
+
+		# Core control parameters for gold+
+		echo 0 > /sys/devices/system/cpu/cpu7/core_ctl/min_cpus
+		echo 60 > /sys/devices/system/cpu/cpu7/core_ctl/busy_up_thres
+		echo 30 > /sys/devices/system/cpu/cpu7/core_ctl/busy_down_thres
+		echo 100 > /sys/devices/system/cpu/cpu7/core_ctl/offline_delay_ms
+		echo 1 > /sys/devices/system/cpu/cpu7/core_ctl/task_thres
+		# Controls how many more tasks should be eligible to run on gold CPUs
+		# w.r.t number of gold CPUs available to trigger assist (max number of
+		# tasks eligible to run on previous cluster minus number of CPUs in
+		# the previous cluster).
+		#
+		# Setting to 1 by default which means there should be at least
+		# 4 tasks eligible to run on gold cluster (tasks running on gold cores
+		# plus misfit tasks on silver cores) to trigger assitance from gold+.
+		echo 1 > /sys/devices/system/cpu/cpu7/core_ctl/nr_prev_assist_thresh
+
+		# Disable Core control on silver
+		echo 0 > /sys/devices/system/cpu/cpu0/core_ctl/enable
+
+		# Setting b.L scheduler parameters
+		echo 95 95 > /proc/sys/kernel/sched_upmigrate
+		echo 85 85 > /proc/sys/kernel/sched_downmigrate
+		echo 100 > /proc/sys/kernel/sched_group_upmigrate
+		echo 10 > /proc/sys/kernel/sched_group_downmigrate
+		echo 1 > /proc/sys/kernel/sched_walt_rotate_big_tasks
+
+		echo 0-3 > /dev/cpuset/background/cpus
+		echo 0-3 > /dev/cpuset/system-background/cpus
+
+
+		# Turn off scheduler boost at the end
+		echo 0 > /proc/sys/kernel/sched_boost
+
+		# configure governor settings for silver cluster
+		echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy0/scaling_governor
+		echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/up_rate_limit_us
+        	echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/down_rate_limit_us
+		echo 1209600 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/hispeed_freq
+		echo 576000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
+		echo 1 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/pl
+
+		# configure governor settings for gold cluster
+		echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy4/scaling_governor
+		echo 0 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/up_rate_limit_us
+	        echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/down_rate_limit_us
+		echo 1612800 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/hispeed_freq
+		echo 1 > /sys/devices/system/cpu/cpufreq/policy4/schedutil/pl
+
+		# configure governor settings for gold+ cluster
+		echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy7/scaling_governor
+		echo 0 > /sys/devices/system/cpu/cpufreq/policy7/schedutil/up_rate_limit_us
+	        echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/down_rate_limit_us
+		echo 1612800 > /sys/devices/system/cpu/cpufreq/policy7/schedutil/hispeed_freq
+		echo 1 > /sys/devices/system/cpu/cpufreq/policy7/schedutil/pl
 
-	# configure governor settings for gold+ cluster
-	echo "schedutil" > /sys/devices/system/cpu/cpufreq/policy7/scaling_governor
-	echo 0 > /sys/devices/system/cpu/cpufreq/policy7/schedutil/up_rate_limit_us
-        echo 0 > /sys/devices/system/cpu/cpufreq/policy0/schedutil/down_rate_limit_us
-	echo 1612800 > /sys/devices/system/cpu/cpufreq/policy7/schedutil/hispeed_freq
-	echo 1 > /sys/devices/system/cpu/cpufreq/policy7/schedutil/pl
+		# configure input boost settings
+		echo "0:1324800" > /sys/module/cpu_boost/parameters/input_boost_freq
+		echo 120 > /sys/module/cpu_boost/parameters/input_boost_ms
 
-	# configure input boost settings
-	echo "0:1324800" > /sys/module/cpu_boost/parameters/input_boost_freq
-	echo 120 > /sys/module/cpu_boost/parameters/input_boost_ms
+		# Disable wsf, beacause we are using efk.
+		# wsf Range : 1..1000 So set to bare minimum value 1.
+	        echo 1 > /proc/sys/vm/watermark_scale_factor
 
-	# Disable wsf, beacause we are using efk.
-	# wsf Range : 1..1000 So set to bare minimum value 1.
-        echo 1 > /proc/sys/vm/watermark_scale_factor
+        	# Enable oom_reaper
+		if [ -f /sys/module/lowmemorykiller/parameters/oom_reaper ]; then
+			echo 1 > /sys/module/lowmemorykiller/parameters/oom_reaper
+		else
+			echo 1 > /proc/sys/vm/reap_mem_on_sigkill
+		fi
 
-        echo 0-3 > /dev/cpuset/background/cpus
-        echo 0-3 > /dev/cpuset/system-background/cpus
+		# Enable bus-dcvs
+		for device in /sys/devices/platform/soc
+		do
+		    for cpubw in $device/*cpu-cpu-llcc-bw/devfreq/*cpu-cpu-llcc-bw
+		    do
+			echo "bw_hwmon" > $cpubw/governor
+			echo "2288 4577 7110 9155 12298 14236 15258" > $cpubw/bw_hwmon/mbps_zones
+			echo 4 > $cpubw/bw_hwmon/sample_ms
+			echo 50 > $cpubw/bw_hwmon/io_percent
+			echo 20 > $cpubw/bw_hwmon/hist_memory
+			echo 10 > $cpubw/bw_hwmon/hyst_length
+			echo 30 > $cpubw/bw_hwmon/down_thres
+			echo 0 > $cpubw/bw_hwmon/guard_band_mbps
+			echo 250 > $cpubw/bw_hwmon/up_scale
+			echo 1600 > $cpubw/bw_hwmon/idle_mbps
+			echo 14236 > $cpubw/max_freq
+        	        echo 40 > $cpubw/polling_interval
+		    done
+
+		    for llccbw in $device/*cpu-llcc-ddr-bw/devfreq/*cpu-llcc-ddr-bw
+	    		do
+				echo "bw_hwmon" > $llccbw/governor
+				echo "1720 2929 3879 5931 6881 7980" > $llccbw/bw_hwmon/mbps_zones
+				echo 4 > $llccbw/bw_hwmon/sample_ms
+				echo 80 > $llccbw/bw_hwmon/io_percent
+				echo 20 > $llccbw/bw_hwmon/hist_memory
+				echo 10 > $llccbw/bw_hwmon/hyst_length
+				echo 30 > $llccbw/bw_hwmon/down_thres
+				echo 0 > $llccbw/bw_hwmon/guard_band_mbps
+				echo 250 > $llccbw/bw_hwmon/up_scale
+				echo 1600 > $llccbw/bw_hwmon/idle_mbps
+				echo 6881 > $llccbw/max_freq
+                		echo 40 > $llccbw/polling_interval
+		    done
+
+		    for npubw in $device/*npu-npu-ddr-bw/devfreq/*npu-npu-ddr-bw
+			do
+				echo 1 > /sys/devices/virtual/npu/msm_npu/pwr
+				echo "bw_hwmon" > $npubw/governor
+				echo "1720 2929 3879 5931 6881 7980" > $npubw/bw_hwmon/mbps_zones
+				echo 4 > $npubw/bw_hwmon/sample_ms
+				echo 80 > $npubw/bw_hwmon/io_percent
+				echo 20 > $npubw/bw_hwmon/hist_memory
+				echo 6  > $npubw/bw_hwmon/hyst_length
+				echo 30 > $npubw/bw_hwmon/down_thres
+				echo 0 > $npubw/bw_hwmon/guard_band_mbps
+				echo 250 > $npubw/bw_hwmon/up_scale
+				echo 0 > $npubw/bw_hwmon/idle_mbps
+		                echo 40 > $npubw/polling_interval
+				echo 0 > /sys/devices/virtual/npu/msm_npu/pwr
+	                      done
+	           done
+	fi
+	# memlat specific settings are moved to seperate file under
+	# device/target specific folder
+	setprop vendor.dcvs.prop 1
 
-        # Enable oom_reaper
-	if [ -f /sys/module/lowmemorykiller/parameters/oom_reaper ]; then
-		echo 1 > /sys/module/lowmemorykiller/parameters/oom_reaper
+	if [ -f /sys/devices/soc0/hw_platform ]; then
+		hw_platform=`cat /sys/devices/soc0/hw_platform`
 	else
-		echo 1 > /proc/sys/vm/reap_mem_on_sigkill
+        	hw_platform=`cat /sys/devices/system/soc/soc0/hw_platform`
 	fi
 
-	# Enable bus-dcvs
-	for device in /sys/devices/platform/soc
-	do
-	    for cpubw in $device/*cpu-cpu-llcc-bw/devfreq/*cpu-cpu-llcc-bw
-	    do
-		echo "bw_hwmon" > $cpubw/governor
-		echo "2288 4577 7110 9155 12298 14236 15258" > $cpubw/bw_hwmon/mbps_zones
-		echo 4 > $cpubw/bw_hwmon/sample_ms
-		echo 50 > $cpubw/bw_hwmon/io_percent
-		echo 20 > $cpubw/bw_hwmon/hist_memory
-		echo 10 > $cpubw/bw_hwmon/hyst_length
-		echo 30 > $cpubw/bw_hwmon/down_thres
-		echo 0 > $cpubw/bw_hwmon/guard_band_mbps
-		echo 250 > $cpubw/bw_hwmon/up_scale
-		echo 1600 > $cpubw/bw_hwmon/idle_mbps
-		echo 14236 > $cpubw/max_freq
-                echo 40 > $cpubw/polling_interval
-	    done
-
-	    for llccbw in $device/*cpu-llcc-ddr-bw/devfreq/*cpu-llcc-ddr-bw
-	    do
-		echo "bw_hwmon" > $llccbw/governor
-		echo "1720 2929 3879 5931 6881 7980" > $llccbw/bw_hwmon/mbps_zones
-		echo 4 > $llccbw/bw_hwmon/sample_ms
-		echo 80 > $llccbw/bw_hwmon/io_percent
-		echo 20 > $llccbw/bw_hwmon/hist_memory
-		echo 10 > $llccbw/bw_hwmon/hyst_length
-		echo 30 > $llccbw/bw_hwmon/down_thres
-		echo 0 > $llccbw/bw_hwmon/guard_band_mbps
-		echo 250 > $llccbw/bw_hwmon/up_scale
-		echo 1600 > $llccbw/bw_hwmon/idle_mbps
-		echo 6881 > $llccbw/max_freq
-                echo 40 > $llccbw/polling_interval
-	    done
-
-	    for npubw in $device/*npu-npu-ddr-bw/devfreq/*npu-npu-ddr-bw
-	    do
-		echo 1 > /sys/devices/virtual/npu/msm_npu/pwr
-		echo "bw_hwmon" > $npubw/governor
-		echo "1720 2929 3879 5931 6881 7980" > $npubw/bw_hwmon/mbps_zones
-		echo 4 > $npubw/bw_hwmon/sample_ms
-		echo 80 > $npubw/bw_hwmon/io_percent
-		echo 20 > $npubw/bw_hwmon/hist_memory
-		echo 6  > $npubw/bw_hwmon/hyst_length
-		echo 30 > $npubw/bw_hwmon/down_thres
-		echo 0 > $npubw/bw_hwmon/guard_band_mbps
-		echo 250 > $npubw/bw_hwmon/up_scale
-		echo 0 > $npubw/bw_hwmon/idle_mbps
-                echo 40 > $npubw/polling_interval
-		echo 0 > /sys/devices/virtual/npu/msm_npu/pwr
-	    done
-	done
-
-    # memlat specific settings are moved to seperate file under
-    # device/target specific folder
-    setprop vendor.dcvs.prop 1
-
-    if [ -f /sys/devices/soc0/hw_platform ]; then
-        hw_platform=`cat /sys/devices/soc0/hw_platform`
-    else
-        hw_platform=`cat /sys/devices/system/soc/soc0/hw_platform`
-    fi
-
-    if [ -f /sys/devices/soc0/platform_subtype_id ]; then
-        platform_subtype_id=`cat /sys/devices/soc0/platform_subtype_id`
-    fi
-
-    case "$hw_platform" in
-        "MTP" | "Surf" | "RCM" )
-            # Start Host based Touch processing
-            case "$platform_subtype_id" in
-                "0" | "1" | "2" | "3" | "4")
-                    start_hbtp
-                    ;;
-            esac
-        ;;
-        "HDK" )
-            if [ -d /sys/kernel/hbtpsensor ] ; then
-                start_hbtp
-            fi
-        ;;
-    esac
-
-    echo 0 > /sys/module/lpm_levels/parameters/sleep_disabled
-    configure_memory_parameters
-    target_type=`getprop ro.hardware.type`
-	if [ -f /sys/devices/soc0/soc_id ]; then
-                soc_id=`cat /sys/devices/soc0/soc_id`
-            else
-                soc_id=`cat /sys/devices/system/soc/soc0/id`
-            fi
-	if [ "$target_type" == "automotive" ]; then
-           # update frequencies
-	   if [ "$soc_id" == "340" ] | [ "$soc_id" == "405" ]; then #sa8195
-		configure_automotive_sku_parameters_sa8195
-	   else #sa8155
-		configure_automotive_sku_parameters
-	   fi
-	fi
+	if [ -f /sys/devices/soc0/platform_subtype_id ]; then
+	   	platform_subtype_id=`cat /sys/devices/soc0/platform_subtype_id`
+   	fi
+
+	case "$hw_platform" in
+		"MTP" | "Surf" | "RCM" )
+	            # Start Host based Touch processing
+		case "$platform_subtype_id" in
+			"0" | "1" | "2" | "3" | "4")
+			start_hbtp
+			;;
+		esac
+		;;
+	        "HDK" )
+		if [ -d /sys/kernel/hbtpsensor ] ; then
+                	start_hbtp
+		fi
+		;;
+	esac
 
+	    echo 0 > /sys/module/lpm_levels/parameters/sleep_disabled
+	    configure_memory_parameters
+	    target_type=`getprop ro.hardware.type`
+		if [ -f /sys/devices/soc0/soc_id ]; then
+			soc_id=`cat /sys/devices/soc0/soc_id`
+	            else
+			soc_id=`cat /sys/devices/system/soc/soc0/id`
+	            fi
+		if [ "$target_type" == "automotive" ]; then
+	           # update frequencies
+		   if [ "$soc_id" == "340" ] | [ "$soc_id" == "405" ]; then #sa8195
+			configure_automotive_sku_parameters_sa8195
+		   else #sa8155
+			configure_automotive_sku_parameters
+		   fi
+		fi
     ;;
 esac
 
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
old mode 100644
new mode 100755
index d973576..4090114
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2012, 2014-2021, The Linux Foundation. All rights reserved.
+# Copyright (c) 2009-2012, 2014-2020, The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -73,7 +73,6 @@ on init
     write /sys/fs/cgroup/memory/bg/memory.swappiness 140
     write /sys/fs/cgroup/memory/bg/memory.move_charge_at_immigrate 1
     chown root system /sys/fs/cgroup/memory/bg/tasks
-    write /sys/kernel/icnss/wpss_boot 1
     chmod 0660 /sys/fs/cgroup/memory/bg/tasks
 
 on post-fs
@@ -799,9 +798,9 @@ on property:persist.sys.qlogd=0
     stop qlogd
 
 service vm_bms /vendor/bin/vm_bms
-    class main
     user root
-    group system wakelock
+    group root
+    disabled
 
 service vendor.msm_irqbalance /vendor/bin/msm_irqbalance -f /system/vendor/etc/msm_irqbalance.conf
     class core
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 4f6773c..dbb78ce 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -29,6 +29,8 @@
 
 on early-init
     write /proc/sys/kernel/sched_boost 1
+    exec u:r:vendor_qti_init_shell:s0 -- /vendor/bin/init.qti.early_init.sh
+    setprop ro.soc.model ${ro.vendor.qti.soc_model}
 
 on init
     write /dev/stune/foreground/schedtune.sched_boost_no_override 1
diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc
index df515ed..4300cdd 100644
--- a/rootdir/etc/ueventd.qcom.rc
+++ b/rootdir/etc/ueventd.qcom.rc
@@ -72,6 +72,7 @@ firmware_directories /vendor/firmware_mnt/image/
 /dev/smd2                 0660   bluetooth  bluetooth
 /dev/smd3                 0660   bluetooth  bluetooth
 /dev/btpower              0660   bluetooth  system
+/dev/btfmslim             0660   bluetooth  system
 
 #permissions for pta
 /dev/pta                  0660   system     system
@@ -173,29 +174,8 @@ firmware_directories /vendor/firmware_mnt/image/
 
 #qvr
 /dev/qvr_external_sensor_ioctl      0660  system  system
-/sys/kernel/qvr_external_sensor/fd  0660  system  system
-/dev/bus/usb/001/002      0660   system     system
-/dev/bus/usb/001/003      0660   system     system
-/dev/bus/usb/001/004      0660   system     system
-/dev/bus/usb/001/005      0660   system     system
-/dev/bus/usb/002/002      0660   system     system
-/dev/bus/usb/002/003      0660   system     system
-/dev/bus/usb/002/004      0660   system     system
-/dev/bus/usb/002/005      0660   system     system
-/dev/bus/usb/003/002      0660   system     system
-/dev/bus/usb/003/003      0660   system     system
-/dev/bus/usb/003/004      0660   system     system
-/dev/bus/usb/003/005      0660   system     system
-/dev/hidraw0              0660   system     system
-/dev/hidraw1              0660   system     system
-/dev/hidraw2              0660   system     system
-/dev/hidraw3              0660   system     system
-/dev/hidraw4              0660   system     system
-/dev/hidraw5              0660   system     system
-/dev/hidraw6              0660   system     system
-/dev/hidraw7              0660   system     system
-/dev/hidraw8              0660   system     system
-/dev/hidraw9              0660   system     system
+/dev/bus/usb/*                      0660  root    usb
+/dev/hidraw*                        0660  root    usb
 
 # wlan
 /dev/wcnss_wlan           0660   system     system
@@ -260,6 +240,7 @@ firmware_directories /vendor/firmware_mnt/image/
 /dev/avtimer              0660   system     audio
 /dev/spidev2.0            0660   system     audio
 /dev/spidev22.0           0660   system     audio
+/dev/spidev10.0           0660   system     audio
 
 # DVB devices
 /dev/dvb/adapter0/demux*  0440   media       media
-- 
GitLab


From 91152637f987741d936df833b1924019e79ed483 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Thu, 17 Nov 2022 21:01:21 +0530
Subject: [PATCH 10/30] FP4: Import init.qti.early_init.sh

Tag: LA.UM.9.12.r1-13800.02-SMxx50.QSSI12.0
---
 rootdir/Android.mk                 |  8 ++++++
 rootdir/bin/init.qti.early_init.sh | 42 ++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 rootdir/bin/init.qti.early_init.sh

diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index d3ce8df..ab582fc 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -56,6 +56,14 @@ LOCAL_SRC_FILES    := bin/init.qti.dcvs.sh
 LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
 include $(BUILD_PREBUILT)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.qti.early_init.sh
+LOCAL_MODULE_TAGS  := optional
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := bin/init.qti.early_init.sh
+LOCAL_MODULE_PATH  := $(TARGET_OUT_VENDOR_EXECUTABLES)
+include $(BUILD_PREBUILT)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE       := init.qti.qcv.sh
 LOCAL_MODULE_TAGS  := optional
diff --git a/rootdir/bin/init.qti.early_init.sh b/rootdir/bin/init.qti.early_init.sh
new file mode 100644
index 0000000..dd08867
--- /dev/null
+++ b/rootdir/bin/init.qti.early_init.sh
@@ -0,0 +1,42 @@
+#! /vendor/bin/sh
+#
+# Copyright (c) 2021 The Linux Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+#       copyright notice, this list of conditions and the following
+#       disclaimer in the documentation and/or other materials provided
+#       with the distribution.
+#     * Neither the name of The Linux Foundation nor the names of its
+#       contributors may be used to endorse or promote products derived
+#       from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+soc_id=`cat /sys/devices/soc0/soc_id` 2> /dev/null
+
+# Store soc_id in ro.vendor.qti.soc_id
+setprop ro.vendor.qti.soc_id $soc_id
+
+if [ "$soc_id" -eq 434 ]; then
+    setprop ro.vendor.qti.soc_model SM6350
+elif [ "$soc_id" -eq 459 ]; then
+    setprop ro.vendor.qti.soc_model SM7225
+elif [ "$soc_id" -eq 400 ] || [ "$soc_id" -eq 440 ]; then
+    setprop ro.vendor.qti.soc_model SM7250
+fi
-- 
GitLab


From aac0f660874f3051bb5c1ca5fd0a6b65c0650a03 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Thu, 17 Nov 2022 20:36:12 +0530
Subject: [PATCH 11/30] FP4: Bump some rootdir scripts from
 FP4.SP1Y.B.041.20230109

---
 rootdir/bin/init.qti.qcv.sh | 3 +++
 rootdir/etc/init.qti.qcv.rc | 1 +
 rootdir/etc/init.stnfc.rc   | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/rootdir/bin/init.qti.qcv.sh b/rootdir/bin/init.qti.qcv.sh
index c1acfcc..b6891e3 100644
--- a/rootdir/bin/init.qti.qcv.sh
+++ b/rootdir/bin/init.qti.qcv.sh
@@ -15,10 +15,13 @@ setprop ro.vendor.qti.soc_id $soc_id
 if [ "$soc_id" -eq 415 ] || [ "$soc_id" -eq 439 ] || [ "$soc_id" -eq 456 ] ||
    [ "$soc_id" -eq 501 ] || [ "$soc_id" -eq 502 ]; then
     setprop ro.vendor.qti.soc_name lahaina
+    setprop ro.vendor.qti.soc_model SM8350
 elif [ "$soc_id" -eq 450 ]; then
     setprop ro.vendor.qti.soc_name shima
+    setprop ro.vendor.qti.soc_model SM7350
 elif [ "$soc_id" -eq 475 ] || [ "$soc_id" -eq 499 ] ||
      [ "$soc_id" -eq 497 ] || [ "$soc_id" -eq 498 ] ||
      [ "$soc_id" -eq 515 ]; then
     setprop ro.vendor.qti.soc_name yupik
+    setprop ro.vendor.qti.soc_model SM7325
 fi
diff --git a/rootdir/etc/init.qti.qcv.rc b/rootdir/etc/init.qti.qcv.rc
index cd19f40..1904162 100644
--- a/rootdir/etc/init.qti.qcv.rc
+++ b/rootdir/etc/init.qti.qcv.rc
@@ -9,3 +9,4 @@ on early-init
     # Set ro.boot.product.vendor.sku to soc_name
     exec u:r:vendor_qti_init_shell:s0 -- /vendor/bin/init.qti.qcv.sh
     setprop ro.boot.product.vendor.sku ${ro.vendor.qti.soc_name}
+    setprop ro.soc.model ${ro.vendor.qti.soc_model}
\ No newline at end of file
diff --git a/rootdir/etc/init.stnfc.rc b/rootdir/etc/init.stnfc.rc
index 96598bf..24063d6 100644
--- a/rootdir/etc/init.stnfc.rc
+++ b/rootdir/etc/init.stnfc.rc
@@ -1,3 +1,6 @@
+
+# This file needs to be executed by vendor_init at boot of the device,
+# both in normal and factory mode.
 on post-fs-data
     mkdir /data/vendor/nfc 0770 nfc nfc
     chmod 0660 /dev/st21nfc
-- 
GitLab


From d692c7f8464c55f3284ed885a83b41b7c69f2f29 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Thu, 17 Nov 2022 21:27:27 +0530
Subject: [PATCH 12/30] FP4: Build init.qti.display_boot scripts

---
 device.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/device.mk b/device.mk
index 38ad939..c067b12 100644
--- a/device.mk
+++ b/device.mk
@@ -202,6 +202,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 \
-- 
GitLab


From d440fffac466e136f3c57f9bd0af7ee90a8106b4 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Fri, 25 Nov 2022 10:02:59 +0530
Subject: [PATCH 13/30] FP4: Label persist.vendor.bt.a2dp_offload_cap

---
 sepolicy/vendor/property_contexts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts
index 3178c76..b1ab620 100644
--- a/sepolicy/vendor/property_contexts
+++ b/sepolicy/vendor/property_contexts
@@ -1,12 +1,15 @@
+# Bluetooth
+persist.vendor.bt.a2dp_offload_cap u:object_r:vendor_bluetooth_prop:s0
+
 # Bluetooth MAC
-ro.vendor.t2m.btmac            u:object_r:vendor_t2m_sys_prop:s0
+ro.vendor.t2m.btmac                u:object_r:vendor_t2m_sys_prop:s0
 
 # Light Sensor Calibration
-ro.vendor.tct.backcaldata      u:object_r:vendor_tct_default_prop:s0
-ro.vendor.tct.frontcaldata     u:object_r:vendor_tct_default_prop:s0
+ro.vendor.tct.backcaldata          u:object_r:vendor_tct_default_prop:s0
+ro.vendor.tct.frontcaldata         u:object_r:vendor_tct_default_prop:s0
 
 # Serial Nums
-vendor.t2m.camera_main.sn      u:object_r:vendor_t2m_sys_prop:s0
-vendor.t2m.camera_aux.sn       u:object_r:vendor_t2m_sys_prop:s0
-vendor.t2m.camera_front.sn     u:object_r:vendor_t2m_sys_prop:s0
-vendor.t2m.fingerprint.chipid  u:object_r:vendor_t2m_sys_prop:s0
+vendor.t2m.camera_main.sn          u:object_r:vendor_t2m_sys_prop:s0
+vendor.t2m.camera_aux.sn           u:object_r:vendor_t2m_sys_prop:s0
+vendor.t2m.camera_front.sn         u:object_r:vendor_t2m_sys_prop:s0
+vendor.t2m.fingerprint.chipid      u:object_r:vendor_t2m_sys_prop:s0
-- 
GitLab


From 1c30f1fd1b6f1882a10be12677778c8acbda761c Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Tue, 29 Nov 2022 11:11:49 +0530
Subject: [PATCH 14/30] FP4: Kill Pixelworks

* Build the whole display HAL stack from source
---
 proprietary-files.txt                         | 36 -------------------
 sepolicy/vendor/attributes                    |  4 ---
 sepolicy/vendor/file_contexts                 |  4 ---
 sepolicy/vendor/hal_display_iris.te           |  4 ---
 .../vendor/hal_graphics_composer_default.te   |  2 --
 sepolicy/vendor/hwservice.te                  |  2 --
 sepolicy/vendor/hwservice_contexts            |  2 --
 7 files changed, 54 deletions(-)
 delete mode 100644 sepolicy/vendor/attributes
 delete mode 100644 sepolicy/vendor/hal_display_iris.te
 delete mode 100644 sepolicy/vendor/hal_graphics_composer_default.te

diff --git a/proprietary-files.txt b/proprietary-files.txt
index d5bb4df..2d5b643 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -291,9 +291,6 @@ vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so
 # Display (HDR)
 vendor/lib64/libhdr_tm.so
 
-# Display (HWC)
-vendor/bin/hw/vendor.qti.hardware.display.composer-service
-
 # Display (SDM)
 vendor/etc/display/advanced_sf_offsets.xml
 vendor/lib64/libdisplayqos.so
@@ -306,9 +303,6 @@ vendor/lib64/libsdm-disp-vndapis.so
 vendor/lib64/libsdmextension.so
 vendor/lib64/libtinyxml2_1.so
 
-# Display (OSS)
-vendor/lib64/libsdmcore.so
-
 # Display postprocessing
 vendor/bin/hw/vendor.display.color@1.0-service
 vendor/bin/ppd
@@ -515,36 +509,6 @@ vendor/etc/lowi.conf
 vendor/etc/sap.conf
 vendor/etc/xtwifi.conf
 
-# Iris
-vendor/bin/hw/vendor.pixelworks.hardware.feature.irisfeature-service
-vendor/etc/init/vendor.pixelworks.hardware.feature.irisfeature-service.rc
--vendor/etc/vintf/manifest/vendor.pixelworks.hardware.display.iris-service.xml
--vendor/etc/vintf/manifest/vendor.pixelworks.hardware.feature.irisfeature-service.xml
-vendor/lib64/libpwirisIoctlWrapper.so
-vendor/lib64/libpwirisPCS.so
-vendor/lib64/libpwiriscalibrate.so
-vendor/lib64/libpwirisfeature.so
-vendor/lib64/libpwirishalwrapper.so
-vendor/lib64/libpwirismcfcheck.so
-vendor/lib64/libpwirispq.so
-vendor/lib64/libpwirisservice.so
-vendor/lib64/libpwirissoft.so
-vendor/lib64/libpwsnapdragoncolor.so
-vendor/lib64/libpwsoftirisPCS.so
-vendor/lib64/vendor.pixelworks.hardware.display@1.0.so
-vendor/lib64/vendor.pixelworks.hardware.display@1.1.so
-vendor/lib64/vendor.pixelworks.hardware.feature@1.0.so
-
-# Iris Firmware
-vendor/etc/display/iris6_ccf1b.fw:vendor/firmware/iris6_ccf1b.fw
-vendor/etc/display/iris6_ccf2b.fw:vendor/firmware/iris6_ccf2b.fw
-vendor/etc/display/iris6_ccf3b.fw:vendor/firmware/iris6_ccf3b.fw
-vendor/etc/irissoft.fw
-vendor/firmware/iris6.fw
-vendor/firmware/iris6_ccf1.fw
-vendor/firmware/iris6_ccf2.fw
-vendor/firmware/iris6_ccf3.fw
-
 # IMS
 -system_ext/app/ImsRcsService/ImsRcsService.apk
 system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml
diff --git a/sepolicy/vendor/attributes b/sepolicy/vendor/attributes
deleted file mode 100644
index e9e6bce..0000000
--- a/sepolicy/vendor/attributes
+++ /dev/null
@@ -1,4 +0,0 @@
-# HALs
-attribute hal_display_iris;
-attribute hal_display_iris_client;
-attribute hal_display_iris_server;
diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts
index ee630a3..0d44c03 100644
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -16,10 +16,6 @@
 /dev/st21nfc                                                               u:object_r:nfc_device:s0
 /vendor/bin/hw/android\.hardware\.nfc@1\.2-service.st                      u:object_r:hal_nfc_default_exec:s0
 
-# Pixelworks
-/vendor/bin/hw/vendor\.pixelworks\.hardware\.display\.iris-service         u:object_r:hal_graphics_composer_default_exec:s0
-/vendor/bin/hw/vendor\.pixelworks\.hardware\.feature\.irisfeature-service  u:object_r:hal_graphics_composer_default_exec:s0
-
 # SSR
 /sys/devices/platform/soc/aab0000.qcom,venus/subsys[0-9]+/name             u:object_r:vendor_sysfs_ssr:s0
 /sys/devices/platform/soc/aab0000.qcom,venus/subsys[0-9]+/restart_level    u:object_r:vendor_sysfs_ssr_toggle:s0
diff --git a/sepolicy/vendor/hal_display_iris.te b/sepolicy/vendor/hal_display_iris.te
deleted file mode 100644
index d3d6acc..0000000
--- a/sepolicy/vendor/hal_display_iris.te
+++ /dev/null
@@ -1,4 +0,0 @@
-hal_attribute_hwservice(hal_display_iris, hal_display_iris_hwservice)
-
-binder_call(hal_display_iris_client, hal_display_iris_server)
-binder_call(hal_display_iris_server, hal_display_iris_client)
diff --git a/sepolicy/vendor/hal_graphics_composer_default.te b/sepolicy/vendor/hal_graphics_composer_default.te
deleted file mode 100644
index c1f17a2..0000000
--- a/sepolicy/vendor/hal_graphics_composer_default.te
+++ /dev/null
@@ -1,2 +0,0 @@
-hal_client_domain(hal_graphics_composer_default, hal_display_iris)
-hal_server_domain(hal_graphics_composer_default, hal_display_iris)
diff --git a/sepolicy/vendor/hwservice.te b/sepolicy/vendor/hwservice.te
index fd65be7..4a01136 100644
--- a/sepolicy/vendor/hwservice.te
+++ b/sepolicy/vendor/hwservice.te
@@ -1,3 +1 @@
 type fp_ext_svc2_hwservice, hwservice_manager_type;
-type hal_display_hwservice, hwservice_manager_type;
-type hal_display_iris_hwservice, hwservice_manager_type;
diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts
index 85d3109..8d4d561 100644
--- a/sepolicy/vendor/hwservice_contexts
+++ b/sepolicy/vendor/hwservice_contexts
@@ -1,3 +1 @@
 vendor.fpsensor.hardware.fpsensorhidlsvc::IFpsensorHidlSvc                 u:object_r:fp_ext_svc2_hwservice:s0
-vendor.pixelworks.hardware.display::IIris                                  u:object_r:hal_display_iris_hwservice:s0
-vendor.pixelworks.hardware.feature::IIrisFeature                           u:object_r:hal_display_iris_hwservice:s0
-- 
GitLab


From 7fac343bbba6149abc17293cb33753c10915f9e1 Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Wed, 8 Feb 2023 10:32:45 +0100
Subject: [PATCH 15/30] FP4: Import gps.conf from FP4.SP1Y.B.041.20230109

---
 configs/gps.conf      | 391 ++++++++++++++++++++++++++++++++++++++++++
 device.mk             |   3 +
 proprietary-files.txt |   1 -
 3 files changed, 394 insertions(+), 1 deletion(-)
 create mode 100644 configs/gps.conf

diff --git a/configs/gps.conf b/configs/gps.conf
new file mode 100644
index 0000000..ee25231
--- /dev/null
+++ b/configs/gps.conf
@@ -0,0 +1,391 @@
+# Error Estimate
+# _SET = 1
+# _CLEAR = 0
+ERR_ESTIMATE=0
+
+#NTP server
+NTP_SERVER=time.xtracloud.net
+
+#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 UE�s 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 c067b12..992a6bf 100644
--- a/device.mk
+++ b/device.mk
@@ -246,6 +246,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/proprietary-files.txt b/proprietary-files.txt
index 2d5b643..fd87cf7 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -503,7 +503,6 @@ vendor/lib64/vendor.qti.hardware.cacert@1.0.so
 # GNSS configs
 vendor/etc/apdr.conf
 vendor/etc/flp.conf
-vendor/etc/gps.conf
 vendor/etc/izat.conf
 vendor/etc/lowi.conf
 vendor/etc/sap.conf
-- 
GitLab


From b113ffd9943f079176a8b916e5a357ab62a6d9f9 Mon Sep 17 00:00:00 2001
From: Bharath <bharath@teamb58.org>
Date: Fri, 20 Jan 2023 13:35:53 +0530
Subject: [PATCH 16/30] FP4: Change NTP server to pool.ntp.org

Change-Id: I93391f307a4c39107498da764c2b6f399a10a2d8
---
 configs/gps.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/gps.conf b/configs/gps.conf
index ee25231..0108d89 100644
--- a/configs/gps.conf
+++ b/configs/gps.conf
@@ -4,7 +4,7 @@
 ERR_ESTIMATE=0
 
 #NTP server
-NTP_SERVER=time.xtracloud.net
+NTP_SERVER=pool.ntp.org
 
 #XTRA CA path
 XTRA_CA_PATH=/usr/lib/ssl-1.1/certs
-- 
GitLab


From 6afab64f837bf34904f43844628f106edc0e854c Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@gmail.com>
Date: Tue, 22 Feb 2022 20:38:00 +0200
Subject: [PATCH 17/30] FP4: Switch to AOSP bluetooth stack

Change-Id: I4f89b8d000df5846864cba985cd5a67e11b17350
---
 BoardConfig.mk                                |  1 -
 configs/component-overrides.xml               |  2 ++
 configs/component-overrides_qti.xml           | 23 ------------
 device.mk                                     |  5 +--
 manifest.xml                                  | 10 ++++++
 .../apps/Bluetooth/res/values/config.xml      | 36 -------------------
 system.prop                                   |  1 -
 7 files changed, 15 insertions(+), 63 deletions(-)
 delete mode 100644 configs/component-overrides_qti.xml
 delete mode 100644 overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index aa7491e..17a0830 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -51,7 +51,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
diff --git a/configs/component-overrides.xml b/configs/component-overrides.xml
index 7201f9f..4d058d3 100644
--- a/configs/component-overrides.xml
+++ b/configs/component-overrides.xml
@@ -12,6 +12,8 @@
 -->
 <config>
     <component-override package="com.android.bluetooth" >
+        <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
+        <component class=".hid.HidDeviceService" enabled="true" />
         <component class=".sap.SapService" enabled="true" />
     </component-override>
 </config>
diff --git a/configs/component-overrides_qti.xml b/configs/component-overrides_qti.xml
deleted file mode 100644
index 4daa783..0000000
--- a/configs/component-overrides_qti.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<config>
-    <component-override package="com.android.bluetooth" >
-        <component class=".a2dpsink.A2dpSinkService" enabled="true" />
-        <component class=".avrcp.AvrcpTargetService" enabled="false" />
-        <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" />
-        <component class=".ba.BATService" enabled="true" />
-        <component class=".hfpclient.HeadsetClientService" enabled="false" />
-        <component class=".hid.HidDeviceService" enabled="true" />
-        <component class=".hid.HidHostService" enabled="true" />
-    </component-override>
-</config>
diff --git a/device.mk b/device.mk
index 992a6bf..4e8f34e 100644
--- a/device.mk
+++ b/device.mk
@@ -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,7 @@ 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
 
 # Display
 PRODUCT_PACKAGES += \
diff --git a/manifest.xml b/manifest.xml
index 8ead6a5..cab51e4 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -29,6 +29,16 @@
         </interface>
         <fqname>@1.0::IBluetoothHci/default</fqname>
     </hal>
+    <hal format="hidl">
+        <name>android.hardware.bluetooth.audio</name>
+        <transport>hwbinder</transport>
+        <version>2.0</version>
+        <interface>
+            <name>IBluetoothAudioProvidersFactory</name>
+            <instance>default</instance>
+        </interface>
+        <fqname>@2.0::IBluetoothAudioProvidersFactory/default</fqname>
+    </hal>
     <hal format="hidl">
         <name>android.hardware.camera.provider</name>
         <transport>hwbinder</transport>
diff --git a/overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml b/overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml
deleted file mode 100644
index c381a0c..0000000
--- a/overlay/vendor/qcom/opensource/commonsys/packages/apps/Bluetooth/res/values/config.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved.
-     Redistribution and use in source and binary forms, with or without
-     modification, are permitted (subject to the limitations in the
-     disclaimer below) provided that the following conditions are met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above
-          copyright notice, this list of conditions and the following
-          disclaimer in the documentation and/or other materials provided
-          with the distribution.
-        * Neither the name of the Linux Foundation nor the names of its
-          contributors may be used to endorse or promote products derived
-          from this software without specific prior written permission.
-     NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-     GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-     HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-     LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<resources>
-    <bool name="profile_supported_avrcp_controller">true</bool>
-    <bool name="profile_supported_a2dp_sink">true</bool>
-    <bool name="profile_supported_sap">true</bool>
-    <bool name="profile_supported_hid_device">false</bool>
-    <bool name="profile_supported_avrcp_target">false</bool>
-    <bool name="profile_supported_ba">true</bool>
-</resources>
diff --git a/system.prop b/system.prop
index 9c999f7..3b8b6cc 100644
--- a/system.prop
+++ b/system.prop
@@ -1,5 +1,4 @@
 # Bluetooth
-ro.bluetooth.library_name=libbluetooth_qti.so
 persist.bluetooth.disableinbandringing=false
 
 # Camera
-- 
GitLab


From ee46b2a6b37cdecdf5f23a770af701af269f96b6 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Thu, 14 Mar 2019 14:30:13 +0100
Subject: [PATCH 18/30] FP4: Don't advertise vorbis offloading support

* Doesn't work at all.

Change-Id: I8cd6341b240c3820dbbdef497e23e785b6ed99dc
---
 audio/audio_policy_configuration.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 79b8ee6..33bbdf8 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -131,9 +131,6 @@
                     <profile name="" format="AUDIO_FORMAT_WMA_PRO"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
                              channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
-                    <profile name="" format="AUDIO_FORMAT_VORBIS"
-                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
                     <profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
-- 
GitLab


From 253f39a173ddc621558998357fa7dbe3196a3558 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Fri, 1 Jan 2021 02:16:24 +0200
Subject: [PATCH 19/30] FP4: audio: Remove FM configuration

Change-Id: I2a9c7864d0007c02138fc89d848018ed5d4b6744
---
 BoardConfig.mk                       |  1 -
 audio/audio_policy_configuration.xml | 14 +-------------
 odm.prop                             |  2 +-
 rootdir/etc/init.qcom.rc             |  8 +-------
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 17a0830..9942605 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
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 33bbdf8..0dcb72a 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -54,7 +54,6 @@
                 <item>Telephony Tx</item>
                 <item>Built-In Mic</item>
                 <item>Built-In Back Mic</item>
-                <item>FM Tuner</item>
                 <item>Telephony Rx</item>
             </attachedDevices>
             <defaultOutputDevice>Speaker</defaultOutputDevice>
@@ -258,10 +257,6 @@
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
                 </devicePort>
-                <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
                             encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
@@ -297,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"/>
                 </devicePort>
-                <devicePort tagName="FM Tuner" type="AUDIO_DEVICE_IN_FM_TUNER" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </devicePort>
                 <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
@@ -337,8 +327,6 @@
                        sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx"/>
                 <route type="mix" sink="Proxy"
                        sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
-                <route type="mix" sink="FM"
-                       sources="primary output"/>
                 <route type="mix" sink="BT SCO"
                        sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
                 <route type="mix" sink="BT SCO Headset"
@@ -354,7 +342,7 @@
                 <route type="mix" sink="voice_rx"
                        sources="Telephony Rx"/>
                 <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,Telephony Rx"/>
                 <route type="mix" sink="usb_surround_sound"
                        sources="USB Device In,USB Headset In"/>
                 <route type="mix" sink="voip_tx"
diff --git a/odm.prop b/odm.prop
index 42e3ba9..3814421 100644
--- a/odm.prop
+++ b/odm.prop
@@ -17,7 +17,7 @@ vendor.audio.feature.external_dsp.enable=false
 vendor.audio.feature.external_speaker.enable=false
 vendor.audio.feature.external_speaker_tfa.enable=false
 vendor.audio.feature.fluence.enable=true
-vendor.audio.feature.fm.enable=true
+vendor.audio.feature.fm.enable=false
 vendor.audio.feature.hdmi_edid.enable=true
 vendor.audio.feature.hdmi_passthrough.enable=true
 vendor.audio.feature.hfp.enable=true
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 4090114..a23fbbd 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -117,10 +117,8 @@ on boot
     chown system system /sys/kernel/debug/msm_core/enable
     chown system system /sys/kernel/debug/msm_core/ptable
     chown system system /sys/kernel/boot_slpi/ssr
-    chown system system /sys/module/radio_iris_transport/parameters/fmsmd_set
     chmod 0660 /sys/module/bluetooth_power/parameters/power
     chmod 0660 /sys/module/hci_smd/parameters/hcismd_set
-    chmod 0660 /sys/module/radio_iris_transport/parameters/fmsmd_set
     chmod 0660 /sys/class/rfkill/rfkill0/state
     chmod 0660 /proc/bluetooth/sleep/proto
     chown bluetooth net_bt /dev/ttyHS0
@@ -332,10 +330,6 @@ on post-fs-data
     #Create a folder for SRS to be able to create a usercfg file
     #mkdir /data/data/media 0770 media media
 
-    #Create FM dir for patchdownloader
-    mkdir /data/vendor/fm 0770 system system
-    chmod 0770 /data/vendor/fm
-
     #Create PERFD deamon related dirs
     mkdir /data/vendor/perfd 0770 root system
     chmod 2770 /data/vendor/perfd
@@ -912,7 +906,7 @@ service vendor.audio-hal /vendor/bin/hw/android.hardware.audio.service
     override
     class hal
     user audioserver
-    # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
+    # media gid needed for /data/misc/media (tee)
     group audio camera drmrpc inet media mediadrm net_bt net_bt_admin net_bw_acct oem_2901 wakelock
     capabilities BLOCK_SUSPEND
     ioprio rt 4
-- 
GitLab


From 8944fde0f0a377ab804823807421c3e88952f6ed Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 24 Apr 2018 00:14:28 +0200
Subject: [PATCH 20/30] FP4: Fix "Earpiece" audio output

Earpiece devicePorts profile mentions it is AUDIO_CHANNEL_IN_MONO,
instead of AUDIO_CHANNEL_OUT_MONO.

Change-Id: I4a88ba6d34d0fcd346eeea2ca903772f0271040a
---
 audio/audio_policy_configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 0dcb72a..dac6951 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -215,7 +215,7 @@
                 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
                 <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
                 </devicePort>
                 <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-- 
GitLab


From bc212ab3a8f8ef5d79e2014d11190000f1a45bcf Mon Sep 17 00:00:00 2001
From: Samyak Jain <samyjain@codeaurora.org>
Date: Tue, 22 Jan 2019 14:58:10 +0530
Subject: [PATCH 21/30] FP4: configs: Remove 2 instance support for "primary
 input"

As FM app no longer uses app loopback,
2 instances of "primary input" is not needed

Change-Id: I7d5e941e916bdf221798ca89360e4751d4af322b
---
 audio/audio_policy_configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index dac6951..9d17a79 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -156,7 +156,7 @@
                              channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
 
-                <mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">
+                <mixPort name="primary input" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
-- 
GitLab


From e7826543331c6a5f073966af446667d580b83950 Mon Sep 17 00:00:00 2001
From: Adithya R <gh0strider.2k18.reborn@gmail.com>
Date: Sun, 18 Oct 2020 19:54:00 +0530
Subject: [PATCH 22/30] FP4: audio: Switch to 24bit for primary and deep buffer
 playback

Signed-off-by: Albert I <kras@raphielgang.org>
Change-Id: I74f9c15567e217db57014ebef93bcc9ff18198e1
---
 audio/audio_io_policy.conf           | 8 ++++----
 audio/audio_policy_configuration.xml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf
index c4a6f89..da005c5 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 9d17a79..b18f2f5 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -59,7 +59,7 @@
             <defaultOutputDevice>Speaker</defaultOutputDevice>
             <mixPorts>
                 <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="raw" role="source"
@@ -69,7 +69,7 @@
                 </mixPort>
                 <mixPort name="deep_buffer" role="source"
                         flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
                 <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
-- 
GitLab


From efe08e068ca55e7e1b0d9b1f2112ec231e7e792f Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 28 Mar 2022 20:24:40 +0300
Subject: [PATCH 23/30] FP4: Add aptX blobs from crosshatch

Change-Id: I5bfdd9f3dc9baea51ab7aad81a0c298b7030193e
---
 proprietary-files.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/proprietary-files.txt b/proprietary-files.txt
index fd87cf7..9c3ba89 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -85,6 +85,10 @@ vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
 
+# Bluetooth (aptX) - from crosshatch - RQ1A.201205.003
+system_ext/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
+system_ext/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e
+
 # Camera
 vendor/lib/libswvdec.so
 vendor/lib64/camera/com.qti.eeprom.gt24p128ef_imx576.so
-- 
GitLab


From 8732d0ef0cc05d20ce94639e8c7737848e162427 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 28 Mar 2022 20:22:52 +0300
Subject: [PATCH 24/30] FP4: Fix A2DP configuration

Clean up for AOSP bt stack usage and fix A2DP with offload disabled.

[merothh]
- Redo changes to audio_policy_configuration_a2dp_offload_disabled.xml
  based on current audio_policy_configuration.xml

Change-Id: If381af4057b5ded2f97e198651faf7e75aecb429
---
 audio/audio_policy_configuration.xml          |  27 +-
 ...cy_configuration_a2dp_offload_disabled.xml | 387 ++++++++++++++++++
 ...hearing_aid_audio_policy_configuration.xml |  20 +
 ...uetooth_qti_audio_policy_configuration.xml |  44 --
 ...hearing_aid_audio_policy_configuration.xml |  38 --
 device.mk                                     |   6 +-
 6 files changed, 414 insertions(+), 108 deletions(-)
 create mode 100644 audio/audio_policy_configuration_a2dp_offload_disabled.xml
 create mode 100644 audio/bluetooth_hearing_aid_audio_policy_configuration.xml
 delete mode 100644 audio/bluetooth_qti_audio_policy_configuration.xml
 delete mode 100644 audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index b18f2f5..337413c 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -366,27 +366,8 @@
 
         </module>
 
-        <!-- A2DP Audio HAL -->
-        <module name="a2dp" halVersion="2.0">
-            <mixPorts>
-                <mixPort name="a2dp input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-            </mixPorts>
-
-            <devicePorts>
-                <devicePort tagName="BT A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
-                </devicePort>
-            </devicePorts>
-
-            <routes>
-                <route type="mix" sink="a2dp input"
-                       sources="BT A2DP In"/>
-            </routes>
-        </module>
+        <!-- A2DP Input Audio HAL -->
+        <xi:include href="/vendor/etc/a2dp_in_audio_policy_configuration.xml"/>
 
         <!-- Usb Audio HAL -->
         <module name="usb" halVersion="2.0">
@@ -411,8 +392,8 @@
         <!-- Remote Submix Audio HAL -->
         <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
 
-        <!-- Bluetooth Audio HAL for hearing aid -->
-        <xi:include href="/vendor/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml"/>
+        <!-- Bluetooth Audio HAL for Hearing aid -->
+        <xi:include href="/vendor/etc/bluetooth_hearing_aid_audio_policy_configuration.xml"/>
 
     </modules>
     <!-- End of Modules section -->
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 0000000..8bc77d5
--- /dev/null
+++ b/audio/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (c) 2016-2021, The Linux Foundation. All rights reserved
+     Not a Contribution.
+-->
+<!-- Copyright (C) 2015 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
+
+    <!-- Global configuration Decalaration -->
+    <globalConfiguration speaker_drc_enabled="true" call_screen_mode_supported="true"/>
+
+
+    <!-- Modules section:
+        There is one section per audio HW module present on the platform.
+        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.
+        The module names are the same as in current .conf file:
+                “primary”, “A2DP”, “remote_submix”, “USB”
+        Each module will contain the following sections:
+        “devicePorts”: a list of device descriptors for all input and output devices accessible via this
+        module.
+        This contains both permanently attached devices and removable devices.
+        “mixPorts”: listing all output and input streams exposed by the audio HAL
+        “routes”: list of possible connections between input and output devices or between stream and
+        devices.
+            "route": is defined by an attribute:
+                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)
+                -"sink": the sink involved in this route
+                -"sources": all the sources than can be connected to the sink via vis route
+        “attachedDevices”: permanently attached devices.
+        The attachedDevices section is a list of devices names. The names correspond to device names
+        defined in <devicePorts> section.
+        “defaultOutputDevice”: device to be used by default when no policy rule applies
+    -->
+    <modules>
+        <!-- Primary Audio HAL -->
+        <module name="primary" halVersion="2.0">
+            <attachedDevices>
+                <item>Earpiece</item>
+                <item>Speaker</item>
+                <item>Telephony Tx</item>
+                <item>Built-In Mic</item>
+                <item>Built-In Back Mic</item>
+                <item>Telephony Rx</item>
+            </attachedDevices>
+            <defaultOutputDevice>Speaker</defaultOutputDevice>
+            <mixPorts>
+                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY">
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="raw" role="source"
+                        flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="deep_buffer" role="source"
+                        flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="hifi_playback" role="source" />
+                <mixPort name="compress_passthrough" role="source"
+                        flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+                </mixPort>
+                <mixPort name="direct_pcm" role="source"
+                        flags="AUDIO_OUTPUT_FLAG_DIRECT">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                  <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                </mixPort>
+                <mixPort name="compressed_offload" role="source"
+                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">
+                    <profile name="" format="AUDIO_FORMAT_MP3"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_FLAC"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_ALAC"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_APE"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_DTS"
+                             samplingRates="32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_DTS_HD"
+                             samplingRates="32000,44100,48000,64000,88200,96000,128000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_WMA"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_WMA_PRO"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
+                             channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V1"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                    <profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V2"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+                </mixPort>
+                <mixPort name="voice_tx" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="voip_rx" role="source"
+                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+                <mixPort name="incall_music_uplink" role="source"
+                        flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000,48000"
+                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+
+                <mixPort name="primary input" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
+                </mixPort>
+                <mixPort name="voip_tx" role="sink"
+                         flags="AUDIO_INPUT_FLAG_VOIP_TX">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+                </mixPort>
+                <mixPort name="usb_surround_sound" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
+                             channelMasks="AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_2,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
+                </mixPort>
+                <mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">
+                    <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/>
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/>
+                </mixPort>
+                <mixPort name="voice_rx" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                </mixPort>
+                <mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
+                </mixPort>
+                <mixPort name="hifi_input" role="sink" />
+                <mixPort name="fast input" role="sink"
+                         flags="AUDIO_INPUT_FLAG_FAST">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
+                </mixPort>
+                <mixPort name="quad mic" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                        samplingRates="48000"
+                        channelMasks="AUDIO_CHANNEL_INDEX_MASK_4"/>
+                </mixPort>
+            </mixPorts>
+
+            <devicePorts>
+                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
+                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
+                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+                </devicePort>
+                <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="Line" type="AUDIO_DEVICE_OUT_LINE" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+                </devicePort>
+                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+                </devicePort>
+                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
+                </devicePort>
+                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+                <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
+                </devicePort>
+                <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
+                </devicePort>
+                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>
+                </devicePort>
+                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>
+                </devicePort>
+
+                <!-- Input devices declaration, i.e. Source DEVICE PORT -->
+                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
+                </devicePort>
+                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
+                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
+                </devicePort>
+                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+                </devicePort>
+                <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+                </devicePort>
+                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
+                </devicePort>
+                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">
+                </devicePort>
+
+            </devicePorts>
+            <!-- route declaration, i.e. list all available sources for a given sink -->
+            <routes>
+                <route type="mix" sink="Earpiece"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+                <route type="mix" sink="Speaker"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+                <route type="mix" sink="Wired Headset"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+                <route type="mix" sink="Wired Headphones"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+                <route type="mix" sink="Line"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+                <route type="mix" sink="HDMI"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx"/>
+                <route type="mix" sink="Proxy"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
+                <route type="mix" sink="BT SCO"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+                <route type="mix" sink="BT SCO Headset"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+                <route type="mix" sink="BT SCO Car Kit"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+                <route type="mix" sink="USB Device Out"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>
+                <route type="mix" sink="USB Headset Out"
+                       sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>
+                <route type="mix" sink="Telephony Tx"
+                       sources="voice_tx,incall_music_uplink"/>
+                <route type="mix" sink="voice_rx"
+                       sources="Telephony Rx"/>
+                <route type="mix" sink="primary input"
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,Telephony Rx"/>
+                <route type="mix" sink="usb_surround_sound"
+                       sources="USB Device In,USB Headset In"/>
+                <route type="mix" sink="voip_tx"
+                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
+                <route type="mix" sink="record_24"
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic"/>
+                <route type="mix" sink="mmap_no_irq_in"
+                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>
+                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
+                <route type="mix" sink="fast input"
+                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
+                <route type="mix" sink="quad mic"
+                       sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In,Wired Headset Mic"/>
+            </routes>
+
+        </module>
+
+        <!-- A2DP Input Audio HAL -->
+        <xi:include href="/vendor/etc/a2dp_in_audio_policy_configuration.xml"/>
+
+        <!-- Usb Audio HAL -->
+        <module name="usb" halVersion="2.0">
+            <mixPorts>
+                <mixPort name="usb_accessory output" role="source">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </mixPort>
+            </mixPorts>
+            <devicePorts>
+                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
+                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                </devicePort>
+            </devicePorts>
+            <routes>
+                <route type="mix" sink="USB Host Out"
+                       sources="usb_accessory output"/>
+            </routes>
+        </module>
+
+        <!-- Remote Submix Audio HAL -->
+        <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>
+
+        <!-- Bluetooth Audio HAL -->
+        <xi:include href="/vendor/etc/bluetooth_audio_policy_configuration.xml"/>
+
+    </modules>
+    <!-- End of Modules section -->
+
+    <!-- Volume section -->
+
+    <xi:include href="/vendor/etc/audio_policy_volumes.xml"/>
+    <xi:include href="/vendor/etc/default_volume_tables.xml"/>
+
+    <!-- End of Volume section -->
+
+</audioPolicyConfiguration>
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 0000000..7dcabf7
--- /dev/null
+++ b/audio/bluetooth_hearing_aid_audio_policy_configuration.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
+<module name="bluetooth" halVersion="2.0">
+    <mixPorts>
+        <!-- Hearing AIDs Audio Ports -->
+        <mixPort name="hearing aid output" role="source">
+            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                     samplingRates="24000,16000"
+                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+        </mixPort>
+    </mixPorts>
+    <devicePorts>
+        <!-- Hearing AIDs Audio Ports -->
+        <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
+    </devicePorts>
+    <routes>
+        <route type="mix" sink="BT Hearing Aid Out"
+               sources="hearing aid output"/>
+    </routes>
+</module>
diff --git a/audio/bluetooth_qti_audio_policy_configuration.xml b/audio/bluetooth_qti_audio_policy_configuration.xml
deleted file mode 100644
index f0b2506..0000000
--- a/audio/bluetooth_qti_audio_policy_configuration.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
-<module name="bluetooth_qti" halVersion="2.0">
-    <mixPorts>
-        <!-- A2DP Audio Ports -->
-        <mixPort name="a2dp output" role="source"/>
-        <!-- Hearing AIDs Audio Ports -->
-        <mixPort name="hearing aid output" role="source">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="24000,16000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </mixPort>
-    </mixPorts>
-    <devicePorts>
-        <!-- A2DP Audio Ports -->
-        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100,48000,88200,96000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </devicePort>
-        <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100,48000,88200,96000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </devicePort>
-        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100,48000,88200,96000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </devicePort>
-        <!-- Hearing AIDs Audio Ports -->
-        <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
-    </devicePorts>
-    <routes>
-        <route type="mix" sink="BT A2DP Out"
-               sources="a2dp output"/>
-        <route type="mix" sink="BT A2DP Headphones"
-               sources="a2dp output"/>
-        <route type="mix" sink="BT A2DP Speaker"
-               sources="a2dp output"/>
-        <route type="mix" sink="BT Hearing Aid Out"
-               sources="hearing aid output"/>
-    </routes>
-</module>
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 7707ae1..0000000
--- a/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2020 The Linux Foundation. All rights reserved.
-     Not a contribution.
--->
-<!-- Copyright (C) 2018 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
-<module name="bluetooth_qti" halVersion="2.0">
-    <mixPorts>
-        <!-- Hearing AIDs Audio Ports -->
-        <mixPort name="hearing aid output" role="source">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="24000,16000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </mixPort>
-    </mixPorts>
-    <devicePorts>
-        <!-- Hearing AIDs Audio Ports -->
-        <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
-    </devicePorts>
-    <routes>
-        <route type="mix" sink="BT Hearing Aid Out"
-               sources="hearing aid output"/>
-    </routes>
-</module>
diff --git a/device.mk b/device.mk
index 4e8f34e..58d9551 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 \
-- 
GitLab


From faa14d5908d785924983de095eca87515782a89f Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 28 Mar 2022 20:46:19 +0300
Subject: [PATCH 25/30] FP4: Fix A2DP AAC frame control property

Change-Id: I21264723c3c8df401e6a3d2f21b15ec18962ac78
---
 vendor.prop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor.prop b/vendor.prop
index 768690e..c7a640f 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -51,7 +51,7 @@ persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
 persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac-aptxadaptiver2
-persist.vendor.qcom.bluetooth.aac_vbr_ctl.enabled=true
+persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.aptxadaptiver2_1_support=false
 persist.vendor.qcom.bluetooth.enable.splita2dp=true
 persist.vendor.qcom.bluetooth.scram.enabled=false
-- 
GitLab


From d1d834126530599849f8018a74f0a22a5933b9fc Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 28 Mar 2022 20:47:59 +0300
Subject: [PATCH 26/30] FP4: Don't report unsupported A2DP offload codecs

Change-Id: I4a3094106507aac0afb847eb1d7bf5189349629e
---
 audio/audio_policy_configuration.xml | 6 +++---
 vendor.prop                          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 337413c..08b923a 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -258,17 +258,17 @@
                              samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
+                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
+                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE AUDIO_FORMAT_APTX_TWSP">
+                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
diff --git a/vendor.prop b/vendor.prop
index c7a640f..72309c5 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -47,10 +47,10 @@ vendor.voice.path.for.pcm.voip=true
 persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
 persist.bluetooth.a2dp_offload.disabled=false
 persist.sys.fflag.override.settings_bluetooth_hearing_aid=true
-persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
+persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
 persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
-persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac-aptxadaptiver2
+persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
 persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.aptxadaptiver2_1_support=false
 persist.vendor.qcom.bluetooth.enable.splita2dp=true
-- 
GitLab


From 7e6a55e18e696ba93e54926d4c81d0d5105bf33e Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 15 Sep 2022 16:03:29 +0100
Subject: [PATCH 27/30] FP4: Remove QTI BT stack bits

Change-Id: Ice6c2b0735aa7cb4b2e638a794c778883e706c97
---
 proprietary-files.txt | 1 -
 vendor.prop           | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 9c3ba89..ed36698 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -75,7 +75,6 @@ vendor/lib64/libsoc_helper.so
 vendor/lib64/vendor.qti.hardware.fm@1.0.so
 
 # Bluetooth (A2DP)
-vendor/lib/hw/audio.bluetooth_qti.default.so
 vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so
 vendor/lib/btaudio_offload_if.so
 vendor/lib/libbluetooth_audio_session_qti.so
diff --git a/vendor.prop b/vendor.prop
index 72309c5..99b924a 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -50,14 +50,7 @@ persist.sys.fflag.override.settings_bluetooth_hearing_aid=true
 persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
 persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
-persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
-persist.vendor.qcom.bluetooth.aac_frm_ctl.enabled=true
-persist.vendor.qcom.bluetooth.aptxadaptiver2_1_support=false
-persist.vendor.qcom.bluetooth.enable.splita2dp=true
-persist.vendor.qcom.bluetooth.scram.enabled=false
 persist.vendor.qcom.bluetooth.soc=cherokee
-persist.vendor.qcom.bluetooth.twsp_state.enabled=false
-persist.vendor.service.bdroid.soc.alwayson=true
 ro.bluetooth.a2dp_offload.supported=true
 ro.vendor.bluetooth.wipower=false
 
-- 
GitLab


From aaf2ee7cf6792078f7f6a2f357fcaa6f5f1cec92 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Tue, 11 Oct 2022 23:35:33 +0300
Subject: [PATCH 28/30] FP4: Set
 persist.vendor.qcom.bluetooth.scram.enabled=true

Fixes SBC/AAC A2DP offload

Change-Id: I8b025e3f61e0f8ad951bd98b88d5307f65191730
---
 vendor.prop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vendor.prop b/vendor.prop
index 99b924a..2bbfd20 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -50,6 +50,7 @@ persist.sys.fflag.override.settings_bluetooth_hearing_aid=true
 persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
 persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
+persist.vendor.qcom.bluetooth.scram.enabled=true
 persist.vendor.qcom.bluetooth.soc=cherokee
 ro.bluetooth.a2dp_offload.supported=true
 ro.vendor.bluetooth.wipower=false
-- 
GitLab


From 2030ab6c451cb47fda435e2346821c00c51c1fcb Mon Sep 17 00:00:00 2001
From: Rohit R Sekhar <merothh@e.email>
Date: Mon, 13 Feb 2023 23:03:57 +0100
Subject: [PATCH 29/30] FP4: Drop aptX support

* Since:
  1. Stock A12 has it broken
  2. We don't want to move back to A11 NON-HLOS firmware to fix this.

* This also reverts commit efe08e068ca55e7e1b0d9b1f2112ec231e7e792f.
---
 audio/audio_policy_configuration.xml | 6 +++---
 proprietary-files.txt                | 8 --------
 vendor.prop                          | 4 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 08b923a..0677a69 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -258,17 +258,17 @@
                              samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">
+                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">
+                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
                 <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC">
+                            encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </devicePort>
diff --git a/proprietary-files.txt b/proprietary-files.txt
index ed36698..46842e8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -34,10 +34,6 @@ vendor/lib/rfsa/adsp/libsns_low_lat_stream_skel.so
 vendor/lib64/rfsa/adsp/libsns_device_mode_skel.so
 vendor/lib64/rfsa/adsp/libsns_low_lat_stream_skel.so
 
-# ADSP modules (aptX)
-vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDADV_Encoder.so
-vendor/lib/rfsa/adsp/capi_v2_aptX_CLHDAD_Speech_Decoder.so
-
 # Audio
 vendor/lib/libacdb-fts.so
 vendor/lib/libacdbloader.so
@@ -84,10 +80,6 @@ vendor/lib64/hw/vendor.qti.hardware.btconfigstore@2.0-impl.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so
 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.1.so
 
-# Bluetooth (aptX) - from crosshatch - RQ1A.201205.003
-system_ext/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
-system_ext/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e
-
 # Camera
 vendor/lib/libswvdec.so
 vendor/lib64/camera/com.qti.eeprom.gt24p128ef_imx576.so
diff --git a/vendor.prop b/vendor.prop
index 2bbfd20..37eb1d1 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -44,10 +44,10 @@ vendor.audio_hal.period_size=192
 vendor.voice.path.for.pcm.voip=true
 
 # Bluetooth
-persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
+persist.bluetooth.a2dp_offload.cap=sbc-aac-ldac
 persist.bluetooth.a2dp_offload.disabled=false
 persist.sys.fflag.override.settings_bluetooth_hearing_aid=true
-persist.vendor.bt.a2dp_offload_cap=sbc-aac-aptx-aptxhd-ldac
+persist.vendor.bt.a2dp_offload_cap=sbc-aac-ldac
 persist.vendor.bt.aac_frm_ctl.enabled=true
 persist.vendor.bt.aac_vbr_frm_ctl.enabled=true
 persist.vendor.qcom.bluetooth.scram.enabled=true
-- 
GitLab


From 1d6c9fff7abfa79b42061c1e624a8d016ae0c7a5 Mon Sep 17 00:00:00 2001
From: Rohit <git@merothh.com>
Date: Thu, 9 Feb 2023 12:04:42 +0530
Subject: [PATCH 30/30] FP4: Add diag_mdlog bin and modify service

* Refer stock SEPolicy
* Denials are:
    type=1400 audit(1676331637.032:51): avc: denied { search } for comm="diag_mdlog" name="0" dev="tmpfs" ino=21291 scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:mnt_user_file:s0 tclass=dir permissive=1
    type=1400 audit(1676331637.032:52): avc: denied { read } for comm="diag_mdlog" name="primary" dev="tmpfs" ino=57147 scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:mnt_user_file:s0 tclass=lnk_file permissive=1
    type=1400 audit(1676331637.032:53): avc: denied { search } for comm="diag_mdlog" name="/" dev="fuse" ino=219 scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:fuse:s0 tclass=dir permissive=1
    type=1400 audit(1676331637.032:54): avc: denied { write } for comm="diag_mdlog" name="0" dev="fuse" ino=2554 scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:fuse:s0 tclass=dir permissive=1
    type=1400 audit(1676331637.032:55): avc: denied { add_name } for comm="diag_mdlog" name="diag_logs" scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:fuse:s0 tclass=dir permissive=1
    type=1400 audit(1676331637.032:56): avc: denied { create } for comm="diag_mdlog" name="diag_logs" scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:fuse:s0 tclass=dir permissive=1
    type=1400 audit(1676331637.032:57): avc: denied { create } for comm="diag_mdlog" name="diag_qsr4_guid_list.xml" scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:fuse:s0 tclass=file permissive=1
    type=1400 audit(1676331638.224:61): avc: denied { getattr } for comm="diag_mdlog" path="/storage/emulated/0/diag_logs/diag_log_20230214_0510381676331638198.qmdl" dev="fuse" ino=5399 scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:fuse:s0 tclass=file permissive=1
    type=1400 audit(1676331642.868:62): avc: denied { getattr } for comm="diag_mdlog" path="/storage/emulated/0/diag_logs/diag_log_20230214_0510381676331638198.qmdl" dev="fuse" ino=5399 scontext=u:r:vendor_qlogd:s0 tcontext=u:object_r:fuse:s0 tclass=file permissive=1
---
 configs/diag/1_default.cfg                | Bin 0 -> 3987 bytes
 configs/diag/2_protocol_audio_vocoder.cfg | Bin 0 -> 3075 bytes
 configs/diag/3_BT_WLAN_FM.cfg             | Bin 0 -> 772 bytes
 configs/diag/4_GNSS_New.cfg               | Bin 0 -> 1633 bytes
 configs/diag/5_audio_network.cfg          | Bin 0 -> 2972 bytes
 configs/diag/6_nw_uim_ds_wms.cfg          | Bin 0 -> 3171 bytes
 configs/diag/7_driver_sensors.cfg         | Bin 0 -> 697 bytes
 device.mk                                 |  10 ++++++++++
 proprietary-files.txt                     |   3 +++
 rootdir/etc/init.qcom.rc                  |   4 ++--
 sepolicy/vendor/vendor_qlogd.te           |   5 +++++
 11 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 configs/diag/1_default.cfg
 create mode 100644 configs/diag/2_protocol_audio_vocoder.cfg
 create mode 100644 configs/diag/3_BT_WLAN_FM.cfg
 create mode 100644 configs/diag/4_GNSS_New.cfg
 create mode 100644 configs/diag/5_audio_network.cfg
 create mode 100644 configs/diag/6_nw_uim_ds_wms.cfg
 create mode 100644 configs/diag/7_driver_sensors.cfg
 create mode 100644 sepolicy/vendor/vendor_qlogd.te

diff --git a/configs/diag/1_default.cfg b/configs/diag/1_default.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..d45838256843162680e61384dab03e02d3a97633
GIT binary patch
literal 3987
zcmb1@v94pN_)zC<#Ky48x2|TgXPwMctvVhNtGeW;3+uf385nja)Om9<FeGiO^X6b+
z*!QN+n}d-d?Q5Mk3j>3!XPq|-Kf~2ib>93E42<(uf@vn!*>&FhIt&`G>b!+48D3Y{
zc?;Pv1hdw83z;+gepu%%WX%xmQRgjW%HVye&RfWep*gV5TZn-}a#~$&EGq*TlsMKE
zgBc7Aw;Jmb7=*IGd}am)21W)320>m1h7XJ<7#JLmfK(mu{CqsR<})`)O5qK|nPw1!
zfx!X_85kKE95_C(^ZalJsRm&V5CO*yEDZm@*MIo)|Nq(t^-LgPhye@?6%YRZ|L-6p
z$H2gF;P?Ok|M!C=85&^H3=9p@3=9lx3=9W79l=rz3=9qoj0^@a4g-S#h*^IQ;&6~g
z36KC7^Dr=QFrYdGERIG5pz%Rm76yhN><kPH><kQ->Olew4j`M^z)S`Ph6V;Mm>U|{
zKr##r3}WmI3<tn$jt&MEm`ZZ#1_mCO)&|A{><8=}7=HZc_uyb)VPMp8U|?Y2V0^~~
zk2R2W+#C!HrVN}7KVbT>(e>{a{g_}Qo4~@r;LrSz-I<$<k%6WC%klUf-~`du<@-Zb
zgy9S}tst?c!*T|-aSVP8|Ct$VKmr4cIWesN&o1Kz4;4^qFM$UmL~X&G|JHw)i!bwn
zxS%Ko(I9-`|8?wX<pU^T{`Rlm&+y<e|9@TvevoRsH~~$Tk%13QWax4WCgj`yDP#hd
z6QJw?_sNC-;czx8L*mEt|NqY;!tX{GJcd9K5YElO04^0!bz$NCuV-MWXTlc#jtp#E
z;M~f<@CQZXe^8NtA~J$G|H~N|>b*GOq0i00z;KWgRKOxaDc*;H;hfny275+(hWk$p
z80!D*VPIge)5r@G6)Jqd!14e8|3~lN*2YHGb1;@TJz$uw(V_z`gNJgsGXEE5_$SZ6
z@W0{!BR?}g!~g%MD{j}uGBA96&!4uGfoTHBbC7hG&h-EP{!2-xSsA(*8JHNiIKV>_
zRH9fiGB8vw`~Uy{LV1S!j0_CSpptq%NcRD7-4V~g!0_Mv|9)v!21af1x&+4A)pbn_
z3=HRZ5HSE!jfwx$1MG)eQV%Ni;5-xtL&N|7^?y)=DC5-s|Ihya9~LwC4}b(A;f@(1
z47i;L(nc+8&r?}f8_NPIqd+Yc83qOh5beVT5@%%q)iUy+I9v|mvx8e4AbAkJPzVy^
z2G`{vJ_y%jfW-J1gg|M55n>id9E3sU@Tr01MHs}O_JG7d_^k*?T#`W&D&BDc#8+TY
zfbw6h0`b)uG@$%{j0_B&f*>(125qPq$PPv+keCsJF;om>wv_@%%#6VdDz^9<h;PYY
z1?7YErQQdL*)upXFff4h{QEBtra|oa>p^lZ46aD(^>RRB9t>Vk^&oX1bNoMn#C;fi
zplUy*f%tw5evtMSgCIYMAIuQU0BPNQi3RZ^7$TtRXL*A7Q4G;gKFCZyXOLJdLoC#;
z-*F&*GD9*{&CLW5zks0t%J&in@n12&VupnO%6TCEJLdOLKFG}3;4rzsew`hn1|)_H
z-w^=m-@$#98x}V844`%+$j>1BA8Icy{h&0p(hOwA0{&I}nD&9<5~TOve@2FX|JfP9
zG}K*(cY^dW3NZ>n?4Ix(#Agv=6@oO1LH6%u1&Of>u|w5-76S1*gjWb-+6A(Q6bv#S
zgh|nZuJ(%$$UUosR|!M>aP$v|UoToO%D`a9z`!sOEMFvEBo1-!8F1W`h?j^nFxWFN
zFu1#c)K3<l43+Oc1>#Q^pAO}p1*gR&;@hEobo(jc_g)0qbwK<8)a+@UAijyBi6X?U
z0*66-8C6wP2w(2MJVR|9s8VHMfG|L||3gZ7b{7~JCcFjd;@05TU|;~H4s=}D29nRy
z=+uCkN+5-S?4TA7no#HM!Z-m`sDP?15C#=GYz+JioD6ad+ziYNybR0?LJW)yS`5q#
zx(v(=`V8z0CJg)xrVR27W(>>>whYV+4h+l;o(%j9J`D97ehf?u0SwFx!3_2cAq@Ns
zp$z;CVGPU+;S9_S5e$qBkqrC{aSV(M2@LEEi44pPNeui9$qdX4DGc@usSL~v84Sz}
onGF04*$m7KISkAUxeUw<c?`@9`3#H<1q_S~g$&FLXAjo_033Ax#Q*>R

literal 0
HcmV?d00001

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
GIT binary patch
literal 3075
zcmb1@v94pN_)zC<#Ky48x2|TgXPwMctvVhNtGeW;3+uf385nja)Om9<FeGiO^X6b+
z*!QN+n}d-d?Q5Mk3j>3!XPq|-Kf~2ib>93E42<(uf@vn!*>&FhIt&`G>b!+48D3Y{
zc?;Pv1hdw83z;+gepu%%WX%xmQRgjW%HVye&RfWep*gV5TZn-}a#~$&EGq*TlsMMa
z#<DOlFflMN$S^Q4$V2g*Ng#1n1`a46BnQG03=9m9GC*?N4E#_zkRFgYNFKzVst%GD
zWDtVNgX9j>#(@My7{rkTK@uR`<^z(GWRPZHU;y!9c;6+ExG{q<RL`M<Aih0=J(Mr1
z4B|U7I70bsrXaotgBO$!atsK6c?S}YW{8H0&sYuOCo?2N`AIb({tM<8%#Z*uz6j#K
zVtxhX3pIiG7uavGL*zkbBIEyP;>vm;^*gwaaYNMq|6k8g548)V?>`b7#K(o_<%7&w
zz`u$gVh*yp|BMi^|Nj{o{{LrZ0Mk%++%o{_>kwWc3{iuuZy?y-tswU-5#KIOefQis
z3o?7B_&z*le|ZB^b3pt6RE_Rb5Z^@6N0IvO!4|&tCqVYesH&+#?fd_~9+VzH=@>+V
z^!$gWH8A`CM{q{0QmiWm=TZiSTa92QGXnzyBLf4&KYj*=5A0Am28IX!|KI=r_dl}%
zMC3ptNDTvn1r&ls8~*<XWmqtq0i3U)ObGShfBnDzU;xnz5rvQf5bF2;|Nre7K_vym
z5fD)j$p<3f*a76Q17OP<4%Bl9FgP$U)SqK;;038@U|_fb@;8VL!k_{MMB~G##zTUD
zg~8wlI|G9Ndjdm8Jt$ZhSXd4^fJ|`!mu4IcAMByQ0TLX3SfPyvo+MZp7#I{e85rsr
zfB*l%poG)2|LgyM{&U-A{=fhE%=z5^zyGiQWzTTs|GV%1e_4Yxf#W|u`8<e?4gb3@
z&rlo3;K%TvnZX8|0(ywC!7Yi#NUGpO2bafWfIP_fJPsakpjwcTkAVT4fS}3?=KZ(-
z^Z7d@w}6r|RGi_%|LX`YvW^e`pa1{={c!#NmIsePxr~r2U<M*+Mn=;0AaoBr3pq3j
zCgj`yDP)F(DI&la7%u$3j;s#h>JR^)KZk`M|9@U^!vZ0TjRh@{;8KkHw!`BTWTiDX
zxDbHL<7WJ?mjKtzm@4*}v%O+x0GY<{=Ys;0JgDkL;^JbWyAhYVAui6c?*u&PxfvK3
zE`c-U|NsA)AxRn(TL1X}G21iLGyI>=z)=4ORC0haA_y}x{Qv*|`~Uxc|NduQ{{P-@
zW)p3=X`uSTfsp~E;{X4}@(lkO|L(v4znlTooMK@352`7_Q3o;yWQy(fx&#KHthxlo
z+0}JT3=9m$pmLF<;H_w2Xkb3@{}0H~3=ALsOE%Oq{P_PJ;*%M21f%pbifvyG7=rmM
H+coL{={j`|

literal 0
HcmV?d00001

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
GIT binary patch
literal 772
zcmb1@v94pN_)u3f*|Sb&s#YD3h*e$k(}i{3{0t1c6Y9J<85okb)p>I;FzkC%=gq;$
zkoL9Cn}vZv*0au=g`eT-sk+)&Rt7LAajdJ2Wnp1pVPIg8XJB9m;{x%87=)mF`7#iH
zir_jyh&)IQJ@Dzrb;V!@GBDg~1T&c#7#J8C7#ObbL&X^w4%Gj*hjVDd*ueMzWHH!q
zCNRkW=R>$4Qi0*Xe|8W9j1Pca*l?g8!~;2*!GQ<FqzVR`#|9=D7#KJjz=pE0FoGfw
Q%pT^1e|%j6gHTo-01?SD_5c6?

literal 0
HcmV?d00001

diff --git a/configs/diag/4_GNSS_New.cfg b/configs/diag/4_GNSS_New.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..9c148375c4b1f831e88c4a10edc888d1dbdd8c62
GIT binary patch
literal 1633
zcmb1@v94pN_)u3f*|Sb&s#YD3h*e$k(}i{3{0t1c6Y9J<85okb)p>I;FzkC%=gq;$
zkoL9Cn}vZv*0au=g`eT-sXA|d9R`h8b+xgq3}8^=SXUd%0%kJEGcYiStO4;^89>q?
z{<-BKK05<D0|SE$0|SH7MG&8pfs26wtX_hFfx#gHB*w?U4;2IHJNh3aCd?oV6>Gl@
z;)^keF)%R5F)%PZI|JfNFo5)f)UQqi@ue7~q3S_mtfxR?3Ji)+F_6BvMv#~qgBn!K
z$Qi`fV=#j9|NsBb4AT3b9pb(+d60YnLl{&ZB!>;VbAr^pV1B_2@#nuUApTqCx6BL-
z_6!URyFx+y_ss8^A?`1p3gYkN-pLKIM>he)-^+aj%Ex90Ol<ovklGI6rNR)sFmZa)
zhrsbsBibbj@gK;K<Y3lob;Xd>!*Ht+%w%R@U|?imV7LNG4h#Ye3=BU&kqTAx;m7~~
zptxaBVFHU-FhHPy0|Ns?0$2!2)W-2aSzrp}I4}cF+yL1G;#EBO|G(b#p8SIE|Nn!M
zasva;pA(Ef!1gmRFt9K*O3O1m_|DAm@qhbQV+N2-4Gawq&zTuM{C`l-<Oni@fgz!x
z;V*LolLH$A1Dgbc0z?o(7CdNxFmRKMAX71=4}gU_z~l%crklf)12+Q$!zECfz!3!h
z#2Fas|JdM=1q)A>tV>`J%Bo9XoLybl#K6GN&V|Q7u$KQI@cIA$|4@Z9{{R2~gOQ>6
zAR_|<C|>^k|1ZzR@W<{SNZtGY-@%&j5N}~}zyBYsXZZHP5>y^G$TIx-|9#&7;|vTR
z+Upe<7(U21oag!X|Gz!Mf&cal3=Q%PfB!Qu{QqzN2Sm#L2ipctxexyT|Ifg{@JF7(
zfVtuS`~Uy{-~SI%w}1YBP)WehP|vUcVr9dBP_C)3X95+S|DS_(LuA0@ALayx1M>eH
N(8a-$BoIws>i~K00f_(r

literal 0
HcmV?d00001

diff --git a/configs/diag/5_audio_network.cfg b/configs/diag/5_audio_network.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..ff65a85f0846e5049ab3cb65dcc0a52abd368d6a
GIT binary patch
literal 2972
zcmb1@v94pN_)u3f*|Sb&s#YD3h*e$k(}i{3{0t1c6Y9J<85okb)p>I;FzkC%=gq;$
zkoL9Cn}vZv*0au=g`eT-sXA|d9R`h8b+xgq3}8^=SXUd%!oa}9z`!8Sz`!5@#j*E5
z;;alHWgzi$%Rzj022Q9tkQhj<Vi8E3n}HjuPZDe%9|J#<x}*O=YJ?bspla+CL3|Mg
zF$M+(IjA}r1_lNNLy)*4gCbPj3m*_)mq8cGw_gY18#5R~`H!c8_*M*7P&3YJfcUly
z_E33{nILyIy#t9mGB`rjv6+JSQ4CQ~J_8$wpUjX9<tNpE_+J=*GD5-xWCl9^9|ltM
zp7}j9M9qm#5Pt{vF>VO||NnZ1dZ>9Iz5kKeAU-ZUFCS#i0{&I}5Oa{#{fD~e|9?h?
z|Nq$;z%)BV-8}=4z7FAK!Vo^PK6<iG{Q|i|Mpac6>W=^N;BWxN2`oJRL&FT@uK)iF
z89vv8^l)qNYcMeUmxt;@3a<%|LGm^lHX4xhDY(C`7@T++7;ZI!nam6f42%p63|BzO
z4kQIinjjj24L}qR0|SE$!=L~E|JyTIfFVQ=R4Ygc0|N(yf{|<td@v?Bhrl@%5B~rE
z?;rz8y<o8h77*0{as!CLz|bIlfDxn_Ap%yxZ~*MWh6D8+3=9Vt7#RNiuLn7dp}_&7
zk0SCvC}a)T7#J8nFg!rmOp%#GNpqJvJT-tqTalB2p`P*g{~ruWIDPTI{{R2~=WXWy
z`=8I8&;9@V|N39{3|DGnL4gR?^dAJmlh1=WScrf3<r!+@82lLiGc(v=k*A9g$hQ!S
zqDhW+kpCE`bi+dqRN^!8F))Dg6vRvhhJtzj?f(>pL&Vr&qM&s4|2l$)tmDJ~=l}nI
zKV1L6<-z0s|9Qdn0YW7<mH?U{BO|hTXp%#Ki|qP>3HkPa3Yjs(?*el8A$#h>|L4zP
z;m1#2_`Oes$0;bv!nqk3{?-2nRYb@ZVPXIOFAqx1*ksJvUa>QPOk?=-K><ktsA@vu
z;$ou5F)npOTl{}H14I29Pk88q+D4ba`SSn&|IFYDfB_U>|M>qg+cVfR{GZOiQ2z&1
zc>MqO|G)jN|Nj^m{{R2~{dN7H%Kr?@|I0Bjm{!3}<7HrAuxA9T`2T;gJi~v+zy0^?
zL3~jC3aURDz%?!?U;qF6pJDdhx&#KHthxlo+0}JT3=9nITwu5031hHU5CK(K(ZF!v
z|H1!%K#o4Z@bAC<|9XZW|NldL^5g$^JVt?~;A!qZs9E&wLm|@vMuvtb|M?l%<iRb#
zhI$1Ch70lx46F<v{)3tdAZ_vufB!Qu{CN)I|F36ZPiO==2~=x>Dqm3D`Qg9)umAtw
zgR1m@|Nq|yNy~zCHh@@gY=59O?!P$0znlO6Kl~3W@7a;vlMl`mlmGu`Kk)zmc2ETh
XG6548y#Ef;4l)%QD#&UMh|~c9(WR?>

literal 0
HcmV?d00001

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
GIT binary patch
literal 3171
zcmb1@v94pN_)u3f*|Sb&s#YD3h*e$k(}i{3{0t1c6Y9J<85okb)p>I;FzkC%=gq;$
zkoL9Cn}vZv*0au=g`eT-sXA|d9R`h8b>2dj46m!}yoGESf?4alh0Ga#Kdkc>vSx_(
zsPh&wW$?aK=PhK#&>UFjEyTbfIjycXmX!evN*wEIV_6s&m>3us<QW(kB%nC<9!Q*(
z0i+Bher`F4&(6RJRR<CSsZ}fjiE}e>L-k35&EsR>M^bn6KS+%bgAh!t48#{<5My9q
zkb{cJFfcGE7=pwV85E&rz3>6?bs2P_eEW4EzA=L_RL`M<AifoY6_kHo1H`vwu!pJ#
znF(@d(>sv3BZDJU9h)hLAH@&_<ukB>_{j{(P<~Pki2sH0CnF?GKxUxh|6w3C@0s5-
zL)4t;1o3xpALEAb|NpONsE3*d()%BY4dUa%^YTIFEZ|?o4>1Q>-G8Wi{{LrW`2U}s
z0Zg+))ZH@x>FW?)CJf;t>!T<8)Gv@bmWXc`r@lMxoCTS^Q+yvDv%kCnsW~8i0IEiJ
zDu^$ms;UZg&wqJvynxaOEPnn&;}8^1|Nj><e69!S;nv{SU|{$!57mbhe-j>q<ZU!;
zG$8p!aDQDfI5ROY+-d|fnHd-u7#SECuJAK3d;l>(Sp}@*fN%l>vmuDd!*GC6hT+fu
z|Nre7EWi+=2dWjMgn@wrLcvHj20j=QoMXY3fJ7=D{Qv*oK?anY7=Hi%|9?LVNVEZD
zHHg8$&>($)5u_O*!r}mtfsz~o3<nq(>i_+>2P<iC02c*NNeqX;#gQ2Zw?Re!{by!j
zVED(*!0>_n0VCXd2cXgrFTgm%khV#Hrv^}bC~`6|)HDA6|ARpZr)U4y|NsC0yv_W7
z|MQvix&MFvU;oRV;Yw{R8%)Q45C~5`596cL|L)5()W$LRG5lv{utArk7a!zXh+Wa(
z)C6G@M}qvvIHemNa-bTBk&l4^l&4@O6wLc?|EDk<BE}9AWnf_V@c%l3hpgkn|L6bz
ze?MIRzvaQ>|NnWx^%FuRHkJUIAR{BPd1#VDfQ#(<f(iNde+ro~!|wue_#u1h!~f^c
zVd2M5UiiIFg~ur<%EGxB82;7&2UU#77GYuk|1S?p&Ddnj*<P_TfJ|ff^FaYg0jR1(
z;^JbW$1yH-LtFfRIRiue8c%rWgW77B!1?n3|NqROmKp;CD8T;l|6{giuxI!`oq?hL
z52*0?|L^~Q`(6M4F);l9|Nr~z`ahNb8J7Q-V_-0?f}6(6z`y{iGeG(F|6+ND|BQe8
z@7IHLfa+IJ{mB5Xal!I`|1-?KTbIBflvS6&IJ>&8iGhJ(GZ)w`c)}R06+}Q4Rx~gi
z_<!*KACRLDF#P*(|G%E$$N&EjpZxg$9gk69DR`Ru4{D};`%uVqfRUl$$$x$ZHhFN1
zw4q*sf#HHY0|P6=hyS3a0!W*D!{7f541b=3`2Xu!*b^E-P6E}Mpvsqlf#J`G|MtKB
z|9=mv(*OPce;*_*3)0yDV!^Tff!etL;tc<8{{R2*Kd8KCM|Mv>I8#ji|DXN9|Nq-T
ZO%sp_n7H8mcaV0FsnAftRP&~&4ge<&(gy$l

literal 0
HcmV?d00001

diff --git a/configs/diag/7_driver_sensors.cfg b/configs/diag/7_driver_sensors.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..fd49f427db6c77b3cc8b1ebdbb76624274242aa0
GIT binary patch
literal 697
zcmb1@v94pN_)u3f*|Sb&s#YD3h*e$k(}i{3{0t1c6Y9J<85okb)p>I;FzkC%=gq;$
zkoL9Cn}vZv*0au=g`eT-sXA|d9R`h8b>2dj46m!}yoGESf?4alh0Ga#Kdkc>vSx_(
zsPh&wW$?aK=PhK#&>UFjEyTbfIjycXmX!evN*wEIV_8fYOc@v$_(3Ay>xw}X0|UdY
pMlh3^fq{XMfq~&aSQ;ufC@B_9S2bV?jf#*T0-kg05*UQC>HxCDF}VN$

literal 0
HcmV?d00001

diff --git a/device.mk b/device.mk
index 58d9551..9369a78 100644
--- a/device.mk
+++ b/device.mk
@@ -195,6 +195,16 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(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 += \
     android.hardware.graphics.mapper@3.0-impl-qti-display \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 46842e8..31a1982 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -283,6 +283,9 @@ vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service
 vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc
 vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so
 
+# Diag
+vendor/bin/diag_mdlog
+
 # Display (HDR)
 vendor/lib64/libhdr_tm.so
 
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index a23fbbd..aa2ff2e 100755
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -768,14 +768,14 @@ service vendor.ssr_diag /system/vendor/bin/ssr_diag
     group system
     disabled
 
-service diag_mdlog_start /system/vendor/bin/diag_mdlog
+service diag_mdlog_start /vendor/bin/diag_mdlog -s 512 -n 5 -f /vendor/etc/diag/1_default.cfg -o /sdcard/diag_logs/ -c
     class late_start
     user shell
     group system oem_2901 sdcard_rw sdcard_r media_rw
     disabled
     oneshot
 
-service diag_mdlog_stop /system/vendor/bin/diag_mdlog -k
+service diag_mdlog_stop /vendor/bin/diag_mdlog -k
     class late_start
     user shell
     group system oem_2901 sdcard_rw sdcard_r media_rw
diff --git a/sepolicy/vendor/vendor_qlogd.te b/sepolicy/vendor/vendor_qlogd.te
new file mode 100644
index 0000000..10422bc
--- /dev/null
+++ b/sepolicy/vendor/vendor_qlogd.te
@@ -0,0 +1,5 @@
+r_dir_file(vendor_qlogd, mnt_user_file)
+
+# need to create and write files in fuse partition
+allow vendor_qlogd fuse:dir create_dir_perms;
+allow vendor_qlogd fuse:file create_file_perms;
-- 
GitLab