raphael: Freeze SPL to 2025-05-05

raphael: update powerhint for efficiency
raphael: init: Allow kernel to handle blancing foreground cpuset
2025-06-06 05:56:22 +09:00 · 2025-05-22 21:11:02 +09:00 · 2025-05-22 21:10:50 +09:00 · 2025-05-09 00:57:31 +09:00 · 2025-05-08 21:14:27 +09:00 · 2025-05-08 10:07:03 +09:00
43 changed files with 1803 additions and 931 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -6,6 +6,7 @@

 soong_namespace {
    imports: [
+        "bootable/deprecated-ota",
        "hardware/google/interfaces",
        "hardware/google/pixel",
        "hardware/xiaomi",
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -6,6 +6,9 @@

 DEVICE_PATH := device/xiaomi/raphael

+# ANT+
+BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
+
 # Architecture
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-2a-dotprod
@@ -24,12 +27,8 @@ TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a76
 TARGET_OTA_ASSERT_DEVICE := raphael,raphaelin

 # Audio
-AUDIO_FEATURE_ENABLED_EXT_AMPLIFIER := true
-AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
-AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
 AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
-BOARD_USES_ALSA_AUDIO := true

 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := msmnile
@@ -38,7 +37,6 @@ TARGET_NO_BOOTLOADER := true
 # Build
 BUILD_BROKEN_DUP_RULES := true
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
-BUILD_BROKEN_ENFORCE_SYSPROP_OWNER := true

 # ConfigStore
 TARGET_HAS_HDR_DISPLAY := true
@@ -55,11 +53,15 @@ TARGET_FS_CONFIG_GEN := $(DEVICE_PATH)/config.fs
 TARGET_INPUTDISPATCHER_SKIP_EVENT_KEY := 338
 TARGET_USES_FOD_ZPOS := true

+# FM
+BOARD_HAVE_QCOM_FM := true
+
 # HIDL
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \
    $(DEVICE_PATH)/hidl/framework_compatibility_matrix.xml \
    hardware/qcom-caf/common/vendor_framework_compatibility_matrix.xml \
-    hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml
+    hardware/xiaomi/vintf/xiaomi_framework_compatibility_matrix.xml \
+    vendor/lineage/config/device_framework_matrix.xml
 DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/hidl/manifest.xml
 DEVICE_MATRIX_FILE := $(DEVICE_PATH)/hidl/compatibility_matrix.xml
 ODM_MANIFEST_SKUS += nfc
--- a/configs/audio/audio_effects.xml
+++ b/configs/audio/audio_effects.xml
@@ -43,7 +43,6 @@
        <library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>
        <library name="volume_listener" path="libvolumelistener.so"/>
        <library name="audiosphere" path="libasphere.so"/>
-        <library name="shoebox" path="libshoebox.so"/>
        <library name="v4a_re" path="libv4a_re.so"/>
        <!--DOLBY DAP-->
        <library name="dap" path="libswdap.so"/>
@@ -100,7 +99,6 @@
        <effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>
        <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
        <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
-        <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
        <effect name="v4a_standard_re" library="v4a_re" uuid="90380da3-8536-4744-a6a3-5731970e640f"/>
        <!--DOLBY DAP-->
        <effect name="dap" library="dap" uuid="9d4921da-8225-4f29-aefa-39537a04bcaa"/>
--- a/configs/audio/audio_platform_info.xml
+++ b/configs/audio/audio_platform_info.xml
@@ -29,6 +29,7 @@
        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="10011"/>
        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="10011"/>
        <device name="SND_DEVICE_OUT_SPEAKER_PROTECTED" acdb_id="124"/>
+        <device name="SND_DEVICE_OUT_GAME_SPEAKER" acdb_id="10024"/>
        <device name="SND_DEVICE_IN_VOICE_REC_QMIC_FLUENCE" acdb_id="131"/>
        <device name="SND_DEVICE_IN_VOICE_REC_TMIC" acdb_id="131"/>
        <device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="132"/>
@@ -53,8 +54,10 @@
        <device name="SND_DEVICE_IN_USB_HEADSET_MIC" acdb_id="10009"/>
        <device name="SND_DEVICE_IN_HEADSET_MIC" acdb_id="10008"/>
        <device name="SND_DEVICE_OUT_HEADPHONES" acdb_id="10012"/>
+        <device name="SND_DEVICE_OUT_GAME_HEADPHONES" acdb_id="10022"/>
        <device name="SND_DEVICE_OUT_HEADPHONES_44_1" acdb_id="10012"/>
        <device name="SND_DEVICE_OUT_USB_HEADSET" acdb_id="10012"/>
+        <device name="SND_DEVICE_OUT_GAME_USB_HEADSET" acdb_id="10022"/>
        <device name="SND_DEVICE_OUT_USB_HEADPHONES" acdb_id="10012"/>
        <device name="SND_DEVICE_OUT_BT_A2DP" acdb_id="10012"/>
        <device name="SND_DEVICE_IN_USB_REALIME_LOOPBACK_MIC" acdb_id="10019"/>
@@ -66,6 +69,7 @@
            <device name="SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS" module_id="0x10F35" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" module_id="0x10F34" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
+            <device name="SND_DEVICE_IN_GAME_SPEAKER_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
            <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" module_id="0x10F31" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
            <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
            <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F31" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>
@@ -74,6 +78,7 @@
            <device name="SND_DEVICE_IN_SPEAKER_TMIC_AEC_NS" module_id="0x10F35" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" module_id="0x10F34" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
+            <device name="SND_DEVICE_IN_GAME_SPEAKER_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
            <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" module_id="0x10F31" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
            <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F33" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
            <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F31" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>
@@ -140,6 +145,7 @@
    </gain_db_to_level_mapping>
    <backend_names>
        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
+        <device name="SND_DEVICE_OUT_GAME_HEADPHONES" backend="headphones" interface="SLIMBUS_6_RX"/>
        <device name="SND_DEVICE_OUT_BT_SCO_WB" backend="bt-sco-wb" interface="SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_BT_SCO" backend="bt-sco" interface="SLIMBUS_7_RX"/>
        <device name="SND_DEVICE_OUT_BT_A2DP" backend="bt-a2dp" interface="SLIMBUS_7_RX"/>
@@ -147,6 +153,7 @@
        <device name="SND_DEVICE_OUT_ANC_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>
        <device name="SND_DEVICE_OUT_ANC_FB_HEADSET" backend="headphones" interface="SLIMBUS_6_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER" backend="speaker" interface="QUAT_MI2S_RX"/>
+        <device name="SND_DEVICE_OUT_GAME_SPEAKER" backend="speaker" interface="QUAT_MI2S_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES" backend="speaker-and-headphones" interface="QUAT_MI2S_RX-and-SLIMBUS_6_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_LINE" backend="speaker-and-headphones" interface="QUAT_MI2S_RX-and-SLIMBUS_6_RX"/>
        <device name="SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET" backend="speaker-and-headphones" interface="QUAT_MI2S_RX-and-SLIMBUS_6_RX"/>
@@ -275,6 +282,12 @@
                        <mic_info mic_device_id="builtin_mic_2"
                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
                    </snd_dev>
+                    <snd_dev in_snd_device="SND_DEVICE_IN_GAME_SPEAKER_DMIC_AEC_NS">
+                        <mic_info mic_device_id="builtin_mic_1"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                        <mic_info mic_device_id="builtin_mic_2"
+                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
+                    </snd_dev>
                    <snd_dev in_snd_device="SND_DEVICE_IN_VOICE_SPEAKER_MIC">
                        <mic_info mic_device_id="builtin_mic_1"
                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
--- a/configs/audio/mixer_paths_overlay_dynamic.xml
+++ b/configs/audio/mixer_paths_overlay_dynamic.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Copyright (c) 2015-2016, 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,  -->
+<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
+<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->
+<mixer>
+    <ctl name="COMP1 Switch" value="0" />
+    <ctl name="COMP2 Switch" value="0" />
+    <ctl name="HPHL Volume" value="16" />
+    <ctl name="HPHR Volume" value="16" />
+
+    <path name="voice-headphones">
+        <path name="headphones" />
+        <ctl name="COMP1 Switch" value="0" />
+        <ctl name="COMP2 Switch" value="0" />
+        <ctl name="HPHL Volume" value="20" />
+        <ctl name="HPHR Volume" value="20" />
+    </path>
+
+</mixer>
--- a/configs/audio/mixer_paths_overlay_static.xml
+++ b/configs/audio/mixer_paths_overlay_static.xml
@@ -0,0 +1,685 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- Be careful to write the static overlay xml                             -->
+<!-- 1. do not create the new path name here, the new path name should      -->
+<!--    be created in common mixer path xml                                 -->
+<!-- 2. the new path name should not contain the nested path, and should be -->
+<!--    defined follow after default ctrl                                   -->
+<!-- 3. the default ctl here will override that in common mixer path xml    -->
+<!-- 4. the first level path will replace the path in common mixer path xml -->
+<!-- 5. the max nested path can't exceed 10                                 -->
+
+<mixer>
+    <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode1" value="0" />
+    <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode2" value="0" />
+    <ctl name="QUAT_MI2S_RX_Voice Mixer Voip" value="0" />
+    <ctl name="ADC1 Volume" value="8" />
+    <ctl name="ADC2 Volume" value="8" />
+    <ctl name="ADC3 Volume" value="8" />
+    <ctl name="ADC4 Volume" value="8" />
+    <ctl name="TFA Profile" value="speaker" />
+    <ctl name="QUAT_MI2S_RX Channels" value="Two" />
+    <ctl name="QUAT_MI2S_TX Channels" value="Two" />
+    <ctl name="QUAT_MI2S_RX Format" value="S24_LE" />
+    <ctl name="QUAT_MI2S_RX SampleRate" value="KHZ_48" />
+    <ctl name="QUATERNARY_MI2S_RX_VI_FB_MUX" value="ZERO" />
+    <ctl name="QUAT_MI2S_TX Channels" value="Two" />
+    <ctl name="QUAT_MI2S_TX Format" value="S24_LE" />
+    <ctl name="QUAT_MI2S_RX SampleRate" value="KHZ_48" />
+    <ctl name="QUAT_MI2S_TX SampleRate" value="KHZ_48" />
+    <ctl name="External AMIC2 Mux" value="Dual_ADC" />
+    <ctl name="COMP1 Switch" value="0" />
+    <ctl name="COMP2 Switch" value="0" />
+    <ctl name="HPHL Volume" value="20" />
+    <ctl name="HPHR Volume" value="20" />
+
+    <path name="deep-buffer-playback speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="1" />
+    </path>
+
+    <path name="low-latency-playback speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
+    </path>
+
+    <path name="audio-ull-playback speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia8" value="1" />
+    </path>
+
+    <path name="compress-offload-playback speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
+    </path>
+
+    <path name="compress-offload-playback2 speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia7" value="1" />
+    </path>
+
+    <path name="compress-offload-playback3 speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia10" value="1" />
+    </path>
+
+    <path name="compress-offload-playback4 speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia11" value="1" />
+    </path>
+
+    <path name="compress-offload-playback5 speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia12" value="1" />
+    </path>
+
+    <path name="compress-offload-playback6 speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia13" value="1" />
+    </path>
+
+    <path name="compress-offload-playback7 speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia14" value="1" />
+    </path>
+
+    <path name="compress-offload-playback8 speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia15" value="1" />
+    </path>
+
+    <path name="compress-offload-playback9 speaker">
+        <ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia16" value="1" />
+    </path>
+
+    <path name="deep-buffer-playback speaker-protected">
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
+    <path name="deep-buffer-playback speaker-and-display-port">
+        <path name="deep-buffer-playback display-port" />
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
+    <path name="deep-buffer-playback speaker-and-usb-headphones">
+        <path name="deep-buffer-playback usb-headphones" />
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
+    <path name="deep-buffer-playback speaker-and-headphones">
+        <path name="deep-buffer-playback headphones" />
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
+    <path name="deep-buffer-playback speaker-and-bt-sco">
+        <path name="deep-buffer-playback bt-sco" />
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
+    <path name="deep-buffer-playback speaker-and-bt-sco-wb">
+        <path name="deep-buffer-playback bt-sco-wb" />
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
+    <path name="deep-buffer-playback speaker-and-bt-a2dp">
+        <path name="deep-buffer-playback bt-a2dp" />
+        <path name="deep-buffer-playback speaker" />
+    </path>
+
+
+    <path name="low-latency-playback speaker-protected">
+        <path name="low-latency-playback speaker" />
+    </path>
+
+    <path name="low-latency-playback speaker-and-bt-sco">
+        <path name="low-latency-playback bt-sco" />
+        <path name="low-latency-playback speaker" />
+    </path>
+
+    <path name="low-latency-playback speaker-and-bt-sco-wb">
+        <path name="low-latency-playback bt-sco-wb" />
+        <path name="low-latency-playback speaker" />
+    </path>
+
+    <path name="low-latency-playback speaker-and-bt-a2dp">
+        <path name="low-latency-playback bt-a2dp" />
+        <path name="low-latency-playback speaker" />
+    </path>
+
+
+    <path name="low-latency-playback speaker-and-display-port">
+        <path name="low-latency-playback display-port" />
+        <path name="low-latency-playback speaker" />
+    </path>
+
+    <path name="low-latency-playback speaker-and-usb-headphones">
+        <path name="low-latency-playback usb-headphones" />
+        <path name="low-latency-playback speaker" />
+    </path>
+
+    <path name="low-latency-playback speaker-and-headphones">
+        <path name="low-latency-playback headphones" />
+        <path name="low-latency-playback speaker" />
+    </path>
+
+    <path name="audio-ull-playback speaker-protected">
+        <path name="audio-ull-playback speaker" />
+    </path>
+
+    <path name="audio-ull-playback speaker-and-headphones">
+        <path name="audio-ull-playback speaker" />
+        <path name="audio-ull-playback headphones" />
+    </path>
+
+    <path name="audio-ull-playback speaker-and-bt-sco">
+        <path name="audio-ull-playback bt-sco" />
+        <path name="audio-ull-playback speaker" />
+    </path>
+
+    <path name="audio-ull-playback speaker-and-bt-a2dp">
+        <path name="audio-ull-playback bt-a2dp" />
+        <path name="audio-ull-playback speaker" />
+    </path>
+
+    <path name="audio-ull-playback speaker-and-bt-sco-wb">
+        <path name="audio-ull-playback bt-sco-wb" />
+        <path name="audio-ull-playback speaker" />
+    </path>
+
+    <path name="audio-ull-playback speaker-and-display-port">
+        <path name="audio-ull-playback display-port" />
+        <path name="audio-ull-playback speaker" />
+    </path>
+
+    <path name="compress-offload-playback speaker-protected">
+        <path name="compress-offload-playback speaker" />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-display-port">
+        <path name="compress-offload-playback display-port" />
+        <path name="compress-offload-playback speaker" />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-bt-sco">
+        <path name="compress-offload-playback bt-sco" />
+        <path name="compress-offload-playback speaker" />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-bt-a2dp">
+        <path name="compress-offload-playback bt-a2dp" />
+        <path name="compress-offload-playback speaker" />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback bt-sco-wb" />
+        <path name="compress-offload-playback speaker" />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-usb-headphones">
+        <path name="compress-offload-playback usb-headphones" />
+        <path name="compress-offload-playback speaker" />
+    </path>
+
+    <path name="compress-offload-playback speaker-and-headphones">
+        <path name="compress-offload-playback headphones" />
+        <path name="compress-offload-playback speaker" />
+    </path>
+
+    <path name="compress-offload-playback2 speaker-and-display-port">
+        <path name="compress-offload-playback2 display-port" />
+        <path name="compress-offload-playback2 speaker" />
+    </path>
+
+    <path name="compress-offload-playback2 speaker-and-bt-sco">
+        <path name="compress-offload-playback2 bt-sco" />
+        <path name="compress-offload-playback2 speaker" />
+    </path>
+
+    <path name="compress-offload-playback2 speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback2 bt-sco-wb" />
+        <path name="compress-offload-playback2 speaker" />
+    </path>
+
+    <path name="compress-offload-playback2 speaker-and-bt-a2dp">
+        <path name="compress-offload-playback2 bt-a2dp" />
+        <path name="compress-offload-playback2 speaker" />
+    </path>
+
+    <path name="compress-offload-playback2 speaker-and-usb-headphones">
+        <path name="compress-offload-playback2 usb-headphones" />
+        <path name="compress-offload-playback2 speaker" />
+    </path>
+
+    <path name="compress-offload-playback2 speaker-and-headphones">
+        <path name="compress-offload-playback2 headphones" />
+        <path name="compress-offload-playback2 speaker" />
+    </path>
+
+    <path name="compress-offload-playback3 speaker-and-display-port">
+        <path name="compress-offload-playback3 display-port" />
+        <path name="compress-offload-playback3 speaker" />
+    </path>
+
+    <path name="compress-offload-playback3 speaker-and-bt-sco">
+        <path name="compress-offload-playback3 bt-sco" />
+        <path name="compress-offload-playback3 speaker" />
+    </path>
+
+    <path name="compress-offload-playback3 speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback3 bt-sco-wb" />
+        <path name="compress-offload-playback3 speaker" />
+    </path>
+
+    <path name="compress-offload-playback3 speaker-and-bt-a2dp">
+        <path name="compress-offload-playback3 bt-a2dp" />
+        <path name="compress-offload-playback3 speaker" />
+    </path>
+
+    <path name="compress-offload-playback3 speaker-and-usb-headphones">
+        <path name="compress-offload-playback3 usb-headphones" />
+        <path name="compress-offload-playback3 speaker" />
+    </path>
+
+    <path name="compress-offload-playback3 speaker-and-headphones">
+        <path name="compress-offload-playback3 headphones" />
+        <path name="compress-offload-playback3 speaker" />
+    </path>
+
+    <path name="compress-offload-playback4 speaker-and-display-port">
+        <path name="compress-offload-playback4 display-port" />
+        <path name="compress-offload-playback4 speaker" />
+    </path>
+
+    <path name="compress-offload-playback4 speaker-and-usb-headphones">
+        <path name="compress-offload-playback4 usb-headphones" />
+        <path name="compress-offload-playback4 speaker" />
+    </path>
+
+    <path name="compress-offload-playback4 speaker-and-headphones">
+        <path name="compress-offload-playback4 headphones" />
+        <path name="compress-offload-playback4 speaker" />
+    </path>
+
+    <path name="compress-offload-playback4 speaker-and-bt-sco">
+        <path name="compress-offload-playback4 bt-sco" />
+        <path name="compress-offload-playback4 speaker" />
+    </path>
+
+    <path name="compress-offload-playback4 speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback4 bt-sco-wb" />
+        <path name="compress-offload-playback4 speaker" />
+    </path>
+
+    <path name="compress-offload-playback4 speaker-and-bt-a2dp">
+        <path name="compress-offload-playback4 bt-a2dp" />
+        <path name="compress-offload-playback4 speaker" />
+    </path>
+
+    <path name="compress-offload-playback5 speaker-and-display-port">
+        <path name="compress-offload-playback5 display-port" />
+        <path name="compress-offload-playback5 speaker" />
+    </path>
+
+    <path name="compress-offload-playback5 speaker-and-bt-sco">
+        <path name="compress-offload-playback5 bt-sco" />
+        <path name="compress-offload-playback5 speaker" />
+    </path>
+
+    <path name="compress-offload-playback5 speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback5 bt-sco-wb" />
+        <path name="compress-offload-playback5 speaker" />
+    </path>
+
+    <path name="compress-offload-playback5 speaker-and-bt-a2dp">
+        <path name="compress-offload-playback5 bt-a2dp" />
+        <path name="compress-offload-playback5 speaker" />
+    </path>
+
+    <path name="compress-offload-playback5 speaker-and-usb-headphones">
+        <path name="compress-offload-playback5 usb-headphones" />
+        <path name="compress-offload-playback5 speaker" />
+    </path>
+
+    <path name="compress-offload-playback5 speaker-and-headphones">
+        <path name="compress-offload-playback5 headphones" />
+        <path name="compress-offload-playback5 speaker" />
+    </path>
+
+    <path name="compress-offload-playback6 speaker-and-display-port">
+        <path name="compress-offload-playback6 display-port" />
+        <path name="compress-offload-playback6 speaker" />
+    </path>
+
+    <path name="compress-offload-playback6 speaker-and-bt-sco">
+        <path name="compress-offload-playback6 bt-sco" />
+        <path name="compress-offload-playback6 speaker" />
+    </path>
+
+    <path name="compress-offload-playback6 speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback6 bt-sco-wb" />
+        <path name="compress-offload-playback6 speaker" />
+    </path>
+
+    <path name="compress-offload-playback6 speaker-and-bt-a2dp">
+        <path name="compress-offload-playback6 bt-a2dp" />
+        <path name="compress-offload-playback6 speaker" />
+    </path>
+
+    <path name="compress-offload-playback6 speaker-and-usb-headphones">
+        <path name="compress-offload-playback6 usb-headphones" />
+        <path name="compress-offload-playback6 speaker" />
+    </path>
+
+    <path name="compress-offload-playback6 speaker-and-headphones">
+        <path name="compress-offload-playback6 headphones" />
+        <path name="compress-offload-playback6 speaker" />
+    </path>
+
+    <path name="compress-offload-playback7 speaker-and-display-port">
+        <path name="compress-offload-playback7 display-port" />
+        <path name="compress-offload-playback7 speaker" />
+    </path>
+
+    <path name="compress-offload-playback7 speaker-and-bt-sco">
+        <path name="compress-offload-playback7 bt-sco" />
+        <path name="compress-offload-playback7 speaker" />
+    </path>
+
+    <path name="compress-offload-playback7 speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback7 bt-sco-wb" />
+        <path name="compress-offload-playback7 speaker" />
+    </path>
+
+    <path name="compress-offload-playback7 speaker-and-bt-a2dp">
+        <path name="compress-offload-playback7 bt-a2dp" />
+        <path name="compress-offload-playback7 speaker" />
+    </path>
+
+    <path name="compress-offload-playback7 speaker-and-usb-headphones">
+        <path name="compress-offload-playback7 usb-headphones" />
+        <path name="compress-offload-playback7 speaker" />
+    </path>
+
+    <path name="compress-offload-playback7 speaker-and-headphones">
+        <path name="compress-offload-playback7 headphones" />
+        <path name="compress-offload-playback7 speaker" />
+    </path>
+
+    <path name="compress-offload-playback8 speaker-and-display-port">
+        <path name="compress-offload-playback8 display-port" />
+        <path name="compress-offload-playback8 speaker" />
+    </path>
+
+    <path name="compress-offload-playback8 speaker-and-bt-sco">
+        <path name="compress-offload-playback8 bt-sco" />
+        <path name="compress-offload-playback8 speaker" />
+    </path>
+
+    <path name="compress-offload-playback8 speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback8 bt-sco-wb" />
+        <path name="compress-offload-playback8 speaker" />
+    </path>
+
+    <path name="compress-offload-playback8 speaker-and-bt-a2dp">
+        <path name="compress-offload-playback8 bt-a2dp" />
+        <path name="compress-offload-playback8 speaker" />
+    </path>
+
+    <path name="compress-offload-playback8 speaker-and-usb-headphones">
+        <path name="compress-offload-playback8 usb-headphones" />
+        <path name="compress-offload-playback8 speaker" />
+    </path>
+
+    <path name="compress-offload-playback8 speaker-and-headphones">
+        <path name="compress-offload-playback8 headphones" />
+        <path name="compress-offload-playback8 speaker" />
+    </path>
+
+    <path name="compress-offload-playback9 speaker-and-display-port">
+        <path name="compress-offload-playback9 display-port" />
+        <path name="compress-offload-playback9 speaker" />
+    </path>
+
+    <path name="compress-offload-playback9 speaker-and-bt-sco">
+        <path name="compress-offload-playback9 bt-sco" />
+        <path name="compress-offload-playback9 speaker" />
+    </path>
+
+    <path name="compress-offload-playback9 speaker-and-bt-sco-wb">
+        <path name="compress-offload-playback9 bt-sco-wb" />
+        <path name="compress-offload-playback9 speaker" />
+    </path>
+
+    <path name="compress-offload-playback9 speaker-and-bt-a2dp">
+        <path name="compress-offload-playback9 bt-a2dp" />
+        <path name="compress-offload-playback9 speaker" />
+    </path>
+
+    <path name="compress-offload-playback9 speaker-and-usb-headphones">
+        <path name="compress-offload-playback9 usb-headphones" />
+        <path name="compress-offload-playback9 speaker" />
+    </path>
+
+    <path name="compress-offload-playback9 speaker-and-headphones">
+        <path name="compress-offload-playback9 headphones" />
+        <path name="compress-offload-playback9 speaker" />
+    </path>
+
+    <path name="echo-reference-voip speaker">
+        <ctl name="EC Reference Channels" value="One"/>
+        <ctl name="AUDIO_REF_EC_UL10 MUX" value="QUAT_MI2S_RX" />
+    </path>
+
+    <path name="echo-reference speaker">
+        <ctl name="EC Reference Channels" value="One"/>
+        <ctl name="AUDIO_REF_EC_UL1 MUX" value="QUAT_MI2S_RX" />
+    </path>
+
+    <path name="voicemmode1-call speaker">
+        <ctl name="VOC_EXT_EC MUX" value="QUAT_MI2S_RX" />
+        <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode1" value="1" />
+        <ctl name="VoiceMMode1_Tx Mixer SLIM_0_TX_MMode1" value="1" />
+    </path>
+
+    <path name="voicemmode2-call speaker">
+        <ctl name="VOC_EXT_EC MUX" value="QUAT_MI2S_RX" />
+        <ctl name="QUAT_MI2S_RX_Voice Mixer VoiceMMode2" value="1" />
+        <ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
+    </path>
+
+    <path name="ultrasound-proximity">
+        <ctl name="Ultrasound Enable" value="On"/>
+        <ctl name="Ultrasound Mode" value="616"/>
+    </path>
+
+    <path name="ultrasound-output">
+        <ctl name="Ultrasound Enable" value="On" />
+        <ctl name="SLIM RX7 MUX" value="AIF2_PB" />
+        <ctl name="CDC_IF RX7 MUX" value="SLIM RX7" />
+        <ctl name="RX INT0_2 MUX" value="RX7" />
+        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
+        <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
+    </path>
+
+    <path name="ultrasound-input">
+        <ctl name="AIF2_CAP Mixer SLIM TX4" value="1" />
+        <ctl name="CDC_IF TX4 MUX" value="DEC4" />
+        <ctl name="ADC MUX4" value="AMIC" />
+        <ctl name="AMIC MUX4" value="ADC1" />
+        <ctl name="ADC1 Volume" value="8" />
+    </path>
+
+    <!-- for mius start -->
+    <path name="mi_ultrasound-proximity">
+        <ctl name="MI_Ultrasound Enable" value="On"/>
+        <ctl name="MI_Ultrasound Mode" value="618"/>
+    </path>
+
+    <path name="mi_ultrasound-output">
+        <ctl name="MI_Ultrasound Enable" value="On" />
+        <ctl name="SLIM RX7 MUX" value="AIF2_PB" />
+        <ctl name="CDC_IF RX7 MUX" value="SLIM RX7" />
+        <ctl name="RX INT0_2 MUX" value="RX7" />
+        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
+        <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
+    </path>
+
+    <path name="mi_ultrasound-input">
+        <ctl name="AIF2_CAP Mixer SLIM TX4" value="1" />
+        <ctl name="CDC_IF TX4 MUX" value="DEC4" />
+        <ctl name="ADC MUX4" value="AMIC" />
+        <ctl name="AMIC MUX4" value="ADC1" />
+        <ctl name="ADC1 Volume" value="8" />
+    </path>
+    <!-- for mius end -->
+
+    <path name="spkr-vi-record">
+        <ctl name="QUATERNARY_MI2S_RX_VI_FB_MUX" value="QUAT_MI2S_TX" />
+    </path>
+
+    <path name="speaker">
+         <ctl name="TFA Profile" value="speaker" />
+    </path>
+
+    <path name="speaker-protected">
+        <path name="speaker" />
+    </path>
+
+    <path name="voice-speaker">
+        <path name="speaker" />
+    </path>
+
+    <path name="voice-speaker-protected">
+        <path name="speaker" />
+    </path>
+
+    <path name="handset">
+        <ctl name="SLIM RX0 MUX" value="AIF1_PB" />
+        <ctl name="CDC_IF RX0 MUX" value="SLIM RX0" />
+        <ctl name="SLIM_0_RX Channels" value="One" />
+        <ctl name="RX INT0_1 MIX1 INP0" value="RX0" />
+        <ctl name="RX INT0 DEM MUX" value="CLSH_DSM_OUT" />
+        <ctl name="EAR SPKR PA Gain" value="G_6_DB" />
+    </path>
+
+    <path name="handset-mic">
+        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+        <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+        <ctl name="ADC MUX7" value="AMIC" />
+        <ctl name="AMIC MUX7" value="ADC3" />
+        <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+        <ctl name="ADC MUX8" value="AMIC" />
+        <ctl name="AMIC MUX8" value="ADC1" />
+        <ctl name="SLIM_0_TX Channels" value="Two" />
+        <ctl name="ADC3 Volume" value="5" />
+        <ctl name="ADC1 Volume" value="5" />
+    </path>
+
+    <path name="speaker-mic">
+        <ctl name="AIF1_CAP Mixer SLIM TX6" value="1"/>
+        <ctl name="SLIM_0_TX Channels" value="One" />
+        <ctl name="CDC_IF TX6 MUX" value="DEC6" />
+        <ctl name="ADC MUX6" value="AMIC" />
+        <ctl name="AMIC MUX6" value="ADC1" />
+        <ctl name="ADC1 Volume" value="5" />
+    </path>
+
+    <!-- Dual MIC devices -->
+    <path name="handset-dmic-endfire">
+        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+        <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+        <ctl name="ADC MUX7" value="AMIC" />
+        <ctl name="AMIC MUX7" value="ADC3" />
+        <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+        <ctl name="ADC MUX8" value="AMIC" />
+        <ctl name="AMIC MUX8" value="ADC1" />
+        <ctl name="SLIM_0_TX Channels" value="Two" />
+        <ctl name="ADC3 Volume" value="12" />
+        <ctl name="ADC1 Volume" value="12" />
+    </path>
+
+    <path name="speaker-dmic-endfire">
+        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+        <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+        <ctl name="ADC MUX7" value="AMIC" />
+        <ctl name="AMIC MUX7" value="ADC3" />
+        <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+        <ctl name="ADC MUX8" value="AMIC" />
+        <ctl name="AMIC MUX8" value="ADC1" />
+        <ctl name="SLIM_0_TX Channels" value="Two" />
+        <ctl name="ADC3 Volume" value="10" />
+        <ctl name="ADC1 Volume" value="10" />
+    </path>
+
+    <path name="voice-headphones">
+        <path name="headphones" />
+        <ctl name="COMP1 Switch" value="0" />
+        <ctl name="COMP2 Switch" value="0" />
+        <ctl name="HPHL Volume" value="20" />
+        <ctl name="HPHR Volume" value="20" />
+    </path>
+
+    <path name="sidetone-headphones">
+    </path>
+
+    <path name="camcorder-dmic">
+        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+        <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+        <ctl name="ADC MUX7" value="AMIC" />
+        <ctl name="AMIC MUX7" value="ADC3" />
+        <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+        <ctl name="ADC MUX8" value="AMIC" />
+        <ctl name="AMIC MUX8" value="ADC1" />
+        <ctl name="SLIM_0_TX Channels" value="Two" />
+        <ctl name="ADC3 Volume" value="4" />
+        <ctl name="ADC1 Volume" value="4" />
+    </path>
+
+    <path name="handset-dmic-music">
+        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+        <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+        <ctl name="ADC MUX7" value="AMIC" />
+        <ctl name="AMIC MUX7" value="ADC3" />
+        <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+        <ctl name="ADC MUX8" value="AMIC" />
+        <ctl name="AMIC MUX8" value="ADC1" />
+        <ctl name="SLIM_0_TX Channels" value="Two" />
+        <ctl name="ADC3 Volume" value="4" />
+        <ctl name="ADC1 Volume" value="4" />
+    </path>
+
+    <path name="handset-dmic-voice">
+        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+        <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+        <ctl name="ADC MUX7" value="AMIC" />
+        <ctl name="AMIC MUX7" value="ADC3" />
+        <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+        <ctl name="ADC MUX8" value="AMIC" />
+        <ctl name="AMIC MUX8" value="ADC1" />
+        <ctl name="SLIM_0_TX Channels" value="Two" />
+        <ctl name="ADC3 Volume" value="4" />
+        <ctl name="ADC1 Volume" value="4" />
+    </path>
+
+    <path name="handset-dmic-interview">
+        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+        <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+        <ctl name="ADC MUX7" value="AMIC" />
+        <ctl name="AMIC MUX7" value="ADC3" />
+        <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+        <ctl name="ADC MUX8" value="AMIC" />
+        <ctl name="AMIC MUX8" value="ADC1" />
+        <ctl name="SLIM_0_TX Channels" value="Two" />
+        <ctl name="ADC3 Volume" value="6" />
+        <ctl name="ADC1 Volume" value="6" />
+    </path>
+
+    <path name="handset-dmic-hd">
+        <ctl name="AIF1_CAP Mixer SLIM TX7" value="1" />
+        <ctl name="AIF1_CAP Mixer SLIM TX8" value="1" />
+        <ctl name="CDC_IF TX7 MUX" value="DEC7" />
+        <ctl name="ADC MUX7" value="AMIC" />
+        <ctl name="AMIC MUX7" value="ADC3" />
+        <ctl name="CDC_IF TX8 MUX" value="DEC8" />
+        <ctl name="ADC MUX8" value="AMIC" />
+        <ctl name="AMIC MUX8" value="ADC1" />
+        <ctl name="SLIM_0_TX Channels" value="Two" />
+        <ctl name="ADC3 Volume" value="4" />
+        <ctl name="ADC1 Volume" value="4" />
+    </path>
+</mixer>
--- a/configs/audio/mixer_paths_tavil.xml
+++ b/configs/audio/mixer_paths_tavil.xml
--- a/device.mk
+++ b/device.mk
@@ -37,11 +37,15 @@ PRODUCT_PACKAGES += \
    TetheringConfigOverlay \
    WifiOverlay

+PRODUCT_PACKAGES += \
+    NcmTetheringOverlay
+
 PRODUCT_ENFORCE_RRO_TARGETS := *

 # Soong namespaces
 PRODUCT_SOONG_NAMESPACES += \
    $(LOCAL_PATH) \
+    bootable/deprecated-ota \
    hardware/google/interfaces \
    hardware/google/pixel \
    hardware/qcom-caf/common/libqti-perfd-client \
@@ -104,6 +108,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
    suspend.short_suspend_backoff_enabled=true \
    suspend.max_sleep_time_millis=40000

+# ANT+
+PRODUCT_PACKAGES += \
+    AntHalService-Soong
+
 # Audio
 PRODUCT_PACKAGES += \
    android.hardware.audio@7.0-impl \
@@ -112,12 +120,10 @@ PRODUCT_PACKAGES += \
    android.hardware.audio.service \
    android.hardware.bluetooth.audio@2.1-impl \
    android.hardware.soundtrigger@2.2-impl \
-    audio.primary.msmnile \
    audio.bluetooth.default \
    audio.primary.default \
    audio.r_submix.default \
    audio.usb.default \
-    audio_amplifier.msmnile \
    libaudioroute.vendor \
    libaudiopreprocessing \
    libbatterylistener \
@@ -139,13 +145,8 @@ PRODUCT_PACKAGES += \
    libtinycompress \
    libvisualizer \
    libvolumelistener \
-    liba2dpoffload \
-    libhdmiedid \
-    libhfp \
    tinymix

-$(call soong_config_set_bool,android_hardware_audio,skip_speaker_layout_channel_mask_field,true)
-
 # Audio configs
 PRODUCT_COPY_FILES += \
    $(call find-copy-subdir-files,*,$(LOCAL_PATH)/configs/audio/,$(TARGET_COPY_OUT_VENDOR)/etc) \
@@ -185,7 +186,7 @@ PRODUCT_PACKAGES += \
    vendor.qti.hardware.camera.postproc@1.0.vendor \
    vendor.xiaomi.hardware.motor@1.0.vendor

-$(call soong_config_set_bool,camera,override_format_from_reserved,true)
+$(call soong_config_set,camera,override_format_from_reserved,true)
 $(call soong_config_set,camera,package_name,com.android.camera)
 $(call soong_config_set,libcameraservice,ext_lib,libcameraservice_extension.raphael)

@@ -232,7 +233,7 @@ PRODUCT_PACKAGES += \
    vendor.qti.hardware.display.mapperextensions@1.1.vendor

 $(call soong_config_set,qtidisplay,gralloc_handle_has_reserved_size,true)
-$(call soong_config_set_bool,qtimedia,disabled_ubwc,true)
+$(call soong_config_set,qtimedia,disabled_ubwc,true)

 PRODUCT_PACKAGES += \
    disable_configstore
@@ -363,7 +364,11 @@ PRODUCT_PACKAGES += \
 $(call soong_config_set,lineage_health,charging_control_charging_disabled,1)
 $(call soong_config_set,lineage_health,charging_control_charging_enabled,0)
 $(call soong_config_set,lineage_health,charging_control_charging_path,/sys/class/power_supply/battery/input_suspend)
-$(call soong_config_set_bool,lineage_health,charging_control_supports_bypass,false)
+$(call soong_config_set,lineage_health,charging_control_supports_bypass,false)
+
+# Livedisplay
+PRODUCT_PACKAGES += \
+    vendor.lineage.livedisplay@2.1-service.raphael

 # Logging
 SPAMMY_LOG_TAGS := \
@@ -485,12 +490,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
    android.hardware.power.stats@1.0-service.raphael

-# Partitions
-PRODUCT_PACKAGES += \
-    vendor_bt_firmware_mountpoint \
-    vendor_dsp_mountpoint \
-    vendor_firmware_mnt_mountpoint
-
 # Perf
 PRODUCT_PACKAGES += \
    libqti-perfd-client
@@ -507,7 +506,7 @@ PRODUCT_PACKAGES += \
 # Enable Hint maneger for SurfaceFlinger and HWUI
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
    debug.hwui.use_hint_manager=true \
-    debug.hwui.target_cpu_time_percent=30
+    debug.hwui.target_cpu_time_percent=10

 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/configs/etc/powerhint.json:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.json
@@ -542,6 +541,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_SYSTEM_EXT_PROPERTIES  += \
    persist.columbus.model=tap7cls_coral.tflite

+# RCS
+PRODUCT_PACKAGES += \
+    PresencePolling \
+    RcsService
+
 # RIL
 PRODUCT_PACKAGES += \
    libprotobuf-cpp-full \
@@ -685,18 +689,8 @@ PRODUCT_COPY_FILES += \

 # WiFi Display
 PRODUCT_PACKAGES += \
-    libavservices_minijail \
-    libnl \
    libpng.vendor

-PRODUCT_BOOT_JARS += \
-    WfdCommon
-
-PRODUCT_SYSTEM_EXT_PROPERTIES += \
-    debug.sf.enable_hwc_vds=0 \
-    persist.debug.wfd.enable=1 \
-    persist.sys.wfd.virtual=0
-
 # Enable zygote critical window.
 PRODUCT_PROPERTY_OVERRIDES += \
    zygote.critical_window.minute=10
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -18,6 +18,6 @@
  {
    "repository": "vendor_xiaomi_miuicamera",
    "target_path": "vendor/xiaomi/miuicamera",
-    "remote": "evo-gitea"
+    "remote": "evo-codeberg"
  }
 ]
--- a/extract-files.py
+++ b/extract-files.py
@@ -1,108 +0,0 @@
-#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-from extract_utils.fixups_blob import (
-    blob_fixup,
-    blob_fixups_user_type,
-)
-from extract_utils.fixups_lib import (
-    lib_fixups,
-    lib_fixups_user_type,
-)
-from extract_utils.main import (
-    ExtractUtils,
-    ExtractUtilsModule,
-)
-
-namespace_imports = [
-	"device/xiaomi/raphael",
-	"hardware/qcom-caf/sm8150",
-	"hardware/qcom-caf/wlan",
-	"hardware/xiaomi",
-	"vendor/qcom/opensource/dataservices",
-	"vendor/qcom/opensource/commonsys-intf/display",
-	"vendor/qcom/opensource/commonsys/display",
-	"vendor/qcom/opensource/display",
-]
-
-
-def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
-    return f'{lib}_{partition}' if partition == 'vendor' else None
-
-
-lib_fixups: lib_fixups_user_type = {
-    **lib_fixups,
-    (
-        'com.qualcomm.qti.dpm.api@1.0',
-        'vendor.qti.hardware.fm@1.0',
-        'libmmosal',
-        'vendor.qti.hardware.wifidisplaysession@1.0',
-        'vendor.qti.imsrtpservice@3.0',
-    ): lib_fixup_vendor_suffix,
-}
-
-blob_fixups: blob_fixups_user_type = {
-    'vendor/lib64/camera/components/com.qti.node.watermark.so': blob_fixup()
-        .add_needed('libpiex_shim.so'),
-    (
-     'vendor/lib64/libalAILDC.so',
-     'vendor/lib64/libalLDC.so',
-     'vendor/lib64/libalhLDC.so'): blob_fixup()
-        .clear_symbol_version('AHardwareBuffer_allocate')
-        .clear_symbol_version('AHardwareBuffer_describe')
-        .clear_symbol_version('AHardwareBuffer_lock')
-        .clear_symbol_version('AHardwareBuffer_release')
-        .clear_symbol_version('AHardwareBuffer_unlock'),
-     (
-      'vendor/lib64/libarcsoft_dualcam_refocus_front.so',
-      'vendor/lib64/libarcsoft_dualcam_refocus_rear_t.so',
-      'vendor/lib64/libarcsoft_dualcam_refocus_rear_w.so'
-      ): blob_fixup()
-        .clear_symbol_version('remote_handle_close')
-        .clear_symbol_version('remote_handle_invoke')
-        .clear_symbol_version('remote_handle_open')
-        .clear_symbol_version('remote_register_buf_attr')
-        .clear_symbol_version('remote_register_buf'),
-    (
-    'vendor/etc/wfdconfig.xml'
-    ): blob_fixup()
-        .regex_replace('<AudioStreamInSuspend>0</AudioStreamInSuspend>', '<AudioStreamInSuspend>1</AudioStreamInSuspend>')
-        .regex_replace('<HID>0</HID>', '<HID>1</HID>'),
-    (
-        'vendor/lib64/libwvhidl.so',
-        'vendor/lib/mediadrm/libwvdrmengine.so',
-        'vendor/lib64/mediadrm/libwvdrmengine.so'
-    ): blob_fixup()
-        .add_needed('libcrypto_shim.so'),
-    (
-        'vendor/lib/libaudioroute_ext.so',
-    ): blob_fixup()
-        .replace_needed('libaudioroute.so', 'libaudioroute-v34.so'),
-    (
-        'vendor/lib/android.hardware.camera.provider@2.4-external.so',
-        'vendor/lib64/android.hardware.camera.provider@2.4-external.so',
-        'vendor/lib/camera.device@3.4-external-impl.so',
-        'vendor/lib64/camera.device@3.4-external-impl.so',
-        'vendor/lib/camera.device@3.5-external-impl.so',
-        'vendor/lib64/camera.device@3.5-external-impl.so',
-        'vendor/lib/camera.device@3.6-external-impl.so',
-        'vendor/lib64/camera.device@3.6-external-impl.so',
-    ): blob_fixup()
-        .replace_needed('libtinyxml2.so', 'libtinyxml2-v34.so'),
-}  # fmt: skip
-
-module = ExtractUtilsModule(
-    'raphael',
-    'xiaomi',
-    blob_fixups=blob_fixups,
-    lib_fixups=lib_fixups,
-    namespace_imports=namespace_imports,
-)
-
-if __name__ == '__main__':
-    utils = ExtractUtils.device(module)
-    utils.run()
-
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -0,0 +1,101 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=raphael
+VENDOR=xiaomi
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+# Default to sanitizing the vendor folder before extraction
+CLEAN_VENDOR=true
+
+SECTION=
+KANG=
+
+while [ "${#}" -gt 0 ]; do
+    case "${1}" in
+        -n | --no-cleanup )
+                CLEAN_VENDOR=false
+                ;;
+        -k | --kang )
+                KANG="--kang"
+                ;;
+        -s | --section )
+                SECTION="${2}"; shift
+                CLEAN_VENDOR=false
+                ;;
+        * )
+                SRC="${1}"
+                ;;
+    esac
+    shift
+done
+
+if [ -z "${SRC}" ]; then
+    SRC="adb"
+fi
+
+function blob_fixup() {
+    case "${1}" in
+            vendor/lib64/camera/components/com.qti.node.watermark.so)
+            [ "$2" = "" ] && return 0
+            grep -q "libpiex_shim.so" "${2}" || "${PATCHELF}" --add-needed "libpiex_shim.so" "${2}"
+            ;;
+            vendor/lib64/mediadrm/libwvdrmengine.so|vendor/lib64/libwvhidl.so)
+            [ "$2" = "" ] && return 0
+            grep -q "libcrypto-v33.so" "${2}" || "${PATCHELF}" --replace-needed "libcrypto.so" "libcrypto-v33.so" "$2"
+            ;;
+	    vendor/etc/seccomp_policy/atfwd@2.0.policy)
+            [ "$2" = "" ] && return 0
+            grep -q "gettid: 1" "${2}" || echo "gettid: 1" >> "${2}"
+            ;;
+            vendor/etc/libnfc-nci.conf)
+            [ "$2" = "" ] && return 0
+            sed -i "s/NFC_DEBUG_ENABLED=1/NFC_DEBUG_ENABLED=0/" "${2}"
+            ;;
+            vendor/etc/libnfc-nxp.conf)
+            [ "$2" = "" ] && return 0
+            sed -i "/NXPLOG_\w\+_LOGLEVEL/ s/0x03/0x02/" "${2}"
+            sed -i "s/NFC_DEBUG_ENABLED=1/NFC_DEBUG_ENABLED=0/" "${2}"
+            ;;
+        *)
+            return 1
+            ;;
+        vendor/lib64/libdlbdsservice.so | vendor/lib/libstagefright_soft_ac4dec.so | vendor/lib/libstagefright_soft_ddpdec.so)
+            "${PATCHELF}" --replace-needed "libstagefright_foundation.so" "libstagefright_foundation-v33.so" "${2}"
+            ;;
+    esac
+
+    return 0
+}
+
+function blob_fixup_dry() {
+    blob_fixup "$1" ""
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
+
+extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \
+        "${KANG}" --section "${SECTION}"
+
+"${MY_DIR}/setup-makefiles.sh"
--- a/hidl/framework_compatibility_matrix.xml
+++ b/hidl/framework_compatibility_matrix.xml
@@ -87,14 +87,6 @@
 			<instance>default</instance>
 		</interface>
 	</hal>
-        <hal format="hidl" optional="true">
-                <name>android.hardware.power.stats</name>
-                <version>1.0</version>
-                <interface>
-                        <name>IPowerStats</name>
-                        <instance>default</instance>
-                </interface>
-        </hal>
 	<hal format="aidl" optional="true">
 		<name>android.hardware.power</name>
 		<version>5</version>
@@ -223,14 +215,6 @@
 			<instance>default</instance>
 		</interface>
 	</hal>
-	<hal format="hidl" optional="true">
-		<name>android.hardware.health.storage</name>
-		<version>1.0</version>
-		<interface>
-			<name>IStorage</name>
-			<instance>default</instance>
-		</interface>
-	</hal>
 	<hal format="aidl" optional="true">
 		<name>android.hardware.health</name>
 		<version>3</version>
--- a/init/fstab.qcom
+++ b/init/fstab.qcom
@@ -44,7 +44,7 @@ odm                                                     /odm			         erofs

 /dev/block/bootdevice/by-name/cache                     /cache                   ext4     nosuid,noatime,nodev,barrier=1                        wait
 /dev/block/by-name/metadata				                /metadata                ext4     noatime,nosuid,nodev,discard,data=journal,commit=1    wait,formattable,check,first_stage_mount
-/dev/block/bootdevice/by-name/userdata		            /data                    f2fs     noatime,nosuid,nodev,discard,background_gc=sync,reserve_root=32768,resgid=1065,fsync_mode=strict,gc_merge,atgc,checkpoint_merge,compress_algorithm=lz4,compress_extension=apk,compress_extension=apex,compress_extension=so                              latemount,wait,check,formattable,fscompress,quota,reservedsize=128M
+/dev/block/bootdevice/by-name/userdata		            /data                    f2fs     noatime,nosuid,nodev,discard,background_gc=sync,reserve_root=32768,resgid=1065,fsync_mode=strict,inlinecrypt,gc_merge,atgc,checkpoint_merge,compress_algorithm=lz4,compress_extension=apk,compress_extension=apex,compress_extension=so                              latemount,wait,check,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,fscompress,quota,reservedsize=128M
 /dev/block/bootdevice/by-name/modem                     /vendor/firmware_mnt     vfat     ro,shortname=lower,uid=0,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait
 /dev/block/bootdevice/by-name/dsp                       /vendor/dsp              ext4     ro,nosuid,nodev,barrier=1                             wait
 /dev/block/bootdevice/by-name/persist                   /mnt/vendor/persist      ext4     noatime,nosuid,nodev,barrier=1                        wait
--- a/libinit/init_xiaomi_raphael.cpp
+++ b/libinit/init_xiaomi_raphael.cpp
@@ -9,6 +9,8 @@

 #include "vendor_init.h"

+#define FINGERPRINT "Xiaomi/raphael/raphael:11/RKQ1.200826.002/V12.5.2.0.RFKMIXM:user/release-keys"
+
 static const variant_info_t raphael_global_info = {
    .hwc_value = "GLOBAL",
    .sku_value = "",
@@ -17,6 +19,8 @@ static const variant_info_t raphael_global_info = {
    .device = "raphael",
    .marketname = "",
    .model = "Mi 9T Pro",
+    .build_fingerprint = FINGERPRINT,
+
    .nfc = true,
 };

@@ -28,6 +32,8 @@ static const variant_info_t raphaelin_info = {
    .device = "raphaelin",
    .marketname = "",
    .model = "Redmi K20 Pro",
+    .build_fingerprint = FINGERPRINT,
+
    .nfc = false,
 };

@@ -39,6 +45,8 @@ static const variant_info_t raphael_info = {
    .device = "raphael",
    .marketname = "",
    .model = "Redmi K20 Pro",
+    .build_fingerprint = FINGERPRINT,
+
    .nfc = true,
 };

--- a/libinit/libinit_variant.cpp
+++ b/libinit/libinit_variant.cpp
@@ -34,6 +34,13 @@ void set_variant_props(const variant_info_t variant) {
    set_ro_build_prop("marketname", variant.marketname, true);
    set_ro_build_prop("model", variant.model, true);

+    if (access("/system/bin/recovery", F_OK) != 0) {
+        set_ro_build_prop("fingerprint", variant.build_fingerprint);
+        property_override("ro.bootimage.build.fingerprint", variant.build_fingerprint);
+
+        property_override("ro.build.description", fingerprint_to_description(variant.build_fingerprint));
+    }
+
    if (variant.nfc) {
        property_override(SKU_PROP, "nfc");
    	property_override("ro.boot.hardware.sku", "nfc");
--- a/lineage_raphael.mk
+++ b/lineage_raphael.mk
@@ -40,6 +40,5 @@ PRODUCT_CHARACTERISTICS := nosdcard

 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi

-PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="raphael-user 11 RKQ1.200826.002 V12.5.2.0.RFKMIXM release-keys" \
-    BuildFingerprint=Xiaomi/raphael/raphael:11/RKQ1.200826.002/V12.5.2.0.RFKMIXM:user/release-keys
+# Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop
+BUILD_FINGERPRINT := Xiaomi/raphael/raphael:11/RKQ1.200826.002/V12.5.2.0.RFKMIXM:user/release-keys
--- a/livedisplay/Android.bp
+++ b/livedisplay/Android.bp
@@ -0,0 +1,40 @@
+//
+// Copyright (C) 2019-2020 The LineageOS 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.
+
+cc_binary {
+    name: "vendor.lineage.livedisplay@2.1-service.raphael",
+    defaults: ["hidl_defaults"],
+    vintf_fragments: ["vendor.lineage.livedisplay@2.1-service.raphael.xml"],
+    init_rc: ["vendor.lineage.livedisplay@2.1-service.raphael.rc"],
+    relative_install_path: "hw",
+    srcs: [
+        ":vendor.lineage.livedisplay@2.0-sdm-utils",
+        "AntiFlicker.cpp",
+        "SunlightEnhancement.cpp",
+        "service.cpp",
+    ],
+    vendor: true,
+    shared_libs: [
+        "libbase",
+        "libbinder",
+        "libhidlbase",
+        "libutils",
+        "vendor.lineage.livedisplay@2.0",
+        "vendor.lineage.livedisplay@2.1",
+    ],
+    header_libs: [
+        "vendor.lineage.livedisplay@2.0-sdm-headers",
+    ],
+}
--- a/livedisplay/AntiFlicker.cpp
+++ b/livedisplay/AntiFlicker.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 The LineageOS 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.
+ */
+
+#define LOG_TAG "AntiFlickerService"
+
+#include "AntiFlicker.h"
+#include <android-base/logging.h>
+#include <fstream>
+
+namespace vendor {
+namespace lineage {
+namespace livedisplay {
+namespace V2_1 {
+namespace implementation {
+
+static constexpr const char* kDcDimmingPath =
+    "/sys/devices/platform/soc/soc:qcom,dsi-display-primary/dc_dim";
+
+Return<bool> AntiFlicker::isEnabled() {
+    std::ifstream file(kDcDimmingPath);
+    int result = -1;
+    file >> result;
+    LOG(DEBUG) << "Got result " << result << " fail " << file.fail();
+    return !file.fail() && result > 0;
+}
+
+Return<bool> AntiFlicker::setEnabled(bool enabled) {
+    std::ofstream file(kDcDimmingPath);
+    file << (enabled ? "1" : "0");
+    LOG(DEBUG) << "setEnabled fail " << file.fail();
+    return !file.fail();
+}
+
+}  // namespace implementation
+}  // namespace V2_1
+}  // namespace livedisplay
+}  // namespace lineage
+}  // namespace vendor
--- a/livedisplay/AntiFlicker.h
+++ b/livedisplay/AntiFlicker.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 The LineageOS 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.
+ */
+
+#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_1_ANTIFLICKER_H
+#define VENDOR_LINEAGE_LIVEDISPLAY_V2_1_ANTIFLICKER_H
+
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+#include <vendor/lineage/livedisplay/2.1/IAntiFlicker.h>
+
+namespace vendor {
+namespace lineage {
+namespace livedisplay {
+namespace V2_1 {
+namespace implementation {
+
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+using ::android::sp;
+
+class AntiFlicker : public IAntiFlicker {
+  public:
+    // Methods from ::vendor::lineage::livedisplay::V2_1::IAntiFlicker follow.
+    Return<bool> isEnabled() override;
+    Return<bool> setEnabled(bool enabled) override;
+};
+
+}  // namespace implementation
+}  // namespace V2_1
+}  // namespace livedisplay
+}  // namespace lineage
+}  // namespace vendor
+
+#endif  // VENDOR_LINEAGE_LIVEDISPLAY_V2_1_ANTIFLICKER_H
--- a/livedisplay/SunlightEnhancement.cpp
+++ b/livedisplay/SunlightEnhancement.cpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2019-2020 The LineageOS 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.
+ */
+
+#define LOG_TAG "SunlightEnhancementService"
+
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/strings.h>
+
+#include "SunlightEnhancement.h"
+
+namespace vendor {
+namespace lineage {
+namespace livedisplay {
+namespace V2_1 {
+namespace implementation {
+
+static constexpr const char* kHbmStatusPath =
+        "/sys/devices/platform/soc/soc:qcom,dsi-display-primary/hbm";
+
+Return<bool> SunlightEnhancement::isEnabled() {
+    std::string buf;
+    if (!android::base::ReadFileToString(kHbmStatusPath, &buf)) {
+        LOG(ERROR) << "Failed to read " << kHbmStatusPath;
+        return false;
+    }
+    return std::stoi(android::base::Trim(buf)) == 1;
+}
+
+Return<bool> SunlightEnhancement::setEnabled(bool enabled) {
+    if (!android::base::WriteStringToFile((enabled ? "1" : "0"), kHbmStatusPath)) {
+        LOG(ERROR) << "Failed to write " << kHbmStatusPath;
+        return false;
+    }
+    return true;
+}
+
+}  // namespace implementation
+}  // namespace V2_1
+}  // namespace livedisplay
+}  // namespace lineage
+}  // namespace vendor
--- a/livedisplay/SunlightEnhancement.h
+++ b/livedisplay/SunlightEnhancement.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2019-2020 The LineageOS 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.
+ */
+
+#ifndef VENDOR_LINEAGE_LIVEDISPLAY_V2_1_SUNLIGHTENHANCEMENT_H
+#define VENDOR_LINEAGE_LIVEDISPLAY_V2_1_SUNLIGHTENHANCEMENT_H
+
+#include <hidl/MQDescriptor.h>
+#include <hidl/Status.h>
+#include <vendor/lineage/livedisplay/2.1/ISunlightEnhancement.h>
+
+namespace vendor {
+namespace lineage {
+namespace livedisplay {
+namespace V2_1 {
+namespace implementation {
+
+using ::android::sp;
+using ::android::hardware::Return;
+using ::android::hardware::Void;
+
+class SunlightEnhancement : public ISunlightEnhancement {
+  public:
+    // Methods from ::vendor::lineage::livedisplay::V2_1::ISunlightEnhancement follow.
+    Return<bool> isEnabled() override;
+    Return<bool> setEnabled(bool enabled) override;
+};
+
+}  // namespace implementation
+}  // namespace V2_1
+}  // namespace livedisplay
+}  // namespace lineage
+}  // namespace vendor
+
+#endif  // VENDOR_LINEAGE_LIVEDISPLAY_V2_1_SUNLIGHTENHANCEMENT_H
--- a/livedisplay/service.cpp
+++ b/livedisplay/service.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2019-2020 The LineageOS 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.
+ */
+
+#define LOG_TAG "vendor.lineage.livedisplay@2.1-service.raphael"
+
+#include <android-base/logging.h>
+#include <binder/ProcessState.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include "AntiFlicker.h"
+#include "SunlightEnhancement.h"
+#include "livedisplay/sdm/SDMController.h"
+
+using android::OK;
+using android::sp;
+using android::status_t;
+
+using ::vendor::lineage::livedisplay::V2_0::sdm::SDMController;
+using ::vendor::lineage::livedisplay::V2_1::IAntiFlicker;
+using ::vendor::lineage::livedisplay::V2_1::ISunlightEnhancement;
+using ::vendor::lineage::livedisplay::V2_1::implementation::AntiFlicker;
+using ::vendor::lineage::livedisplay::V2_1::implementation::SunlightEnhancement;
+
+int main() {
+    status_t status = OK;
+    std::shared_ptr<SDMController> controller = std::make_shared<SDMController>();
+    sp<AntiFlicker> af = new AntiFlicker();
+    sp<SunlightEnhancement> se = new SunlightEnhancement();
+    android::hardware::configureRpcThreadpool(1, true /*callerWillJoin*/);
+
+    // AntiFlicker service
+    status = af->registerAsService();
+    if (status != OK) {
+        LOG(ERROR) << "Could not register service for LiveDisplay HAL AntiFlicker Iface ("
+                   << status << ")";
+        return 1;
+    }
+
+    // SunlightEnhancement service
+    status = se->registerAsService();
+    if (status != OK) {
+        LOG(ERROR) << "Could not register service for LiveDisplay HAL SunlightEnhancement Iface ("
+                   << status << ")";
+        return 1;
+    }
+
+    LOG(INFO) << "LiveDisplay HAL service is ready.";
+
+    android::hardware::joinRpcThreadpool();
+
+    LOG(ERROR) << "LiveDisplay HAL service failed to join thread pool.";
+    return 1;
+}
--- a/livedisplay/vendor.lineage.livedisplay@2.1-service.raphael.rc
+++ b/livedisplay/vendor.lineage.livedisplay@2.1-service.raphael.rc
@@ -0,0 +1,10 @@
+on boot
+    chown system system /sys/devices/platform/soc/soc:qcom,dsi-display-primary/hbm
+    chown system system /sys/devices/platform/soc/soc:qcom,dsi-display-primary/dc_dim
+    chmod 0660 /sys/devices/platform/soc/soc:qcom,dsi-display-primary/hbm
+    chmod 0660 /sys/devices/platform/soc/soc:qcom,dsi-display-primary/dc_dim
+
+service vendor.livedisplay-hal-2-1 /vendor/bin/hw/vendor.lineage.livedisplay@2.1-service.raphael
+    class hal
+    user system
+    group system
--- a/livedisplay/vendor.lineage.livedisplay@2.1-service.raphael.xml
+++ b/livedisplay/vendor.lineage.livedisplay@2.1-service.raphael.xml
@@ -0,0 +1,8 @@
+<manifest version="1.0" type="device">
+    <hal format="hidl">
+        <name>vendor.lineage.livedisplay</name>
+	<transport>hwbinder</transport>
+	<fqname>@2.1::IAntiFlicker/default</fqname>
+	<fqname>@2.1::ISunlightEnhancement/default</fqname>
+    </hal>
+</manifest>
--- a/odm.prop
+++ b/odm.prop
@@ -1,2 +1,46 @@
+# Audio
+vendor.audio.feature.a2dp_offload.enable=true
+vendor.audio.feature.afe_proxy.enable=true
+vendor.audio.feature.anc_headset.enable=true
+vendor.audio.feature.battery_listener.enable=true
+vendor.audio.feature.compr_cap.enable=false
+vendor.audio.feature.compress_in.enable=false
+vendor.audio.feature.compress_meta_data.enable=true
+vendor.audio.feature.compr_voip.enable=false
+vendor.audio.feature.concurrent_capture.enable=false
+vendor.audio.feature.custom_stereo.enable=true
+vendor.audio.feature.display_port.enable=true
+vendor.audio.feature.dsm_feedback.enable=false
+vendor.audio.feature.dynamic_ecns.enable=false
+vendor.audio.feature.ext_hw_plugin.enable=true
+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.hdmi_edid.enable=true
+vendor.audio.feature.hdmi_passthrough.enable=true
+vendor.audio.feature.hfp.enable=true
+vendor.audio.feature.hifi_audio.enable=false
+vendor.audio.feature.hwdep_cal.enable=false
+vendor.audio.feature.incall_music.enable=true
+vendor.audio.feature.multi_voice_session.enable=true
+vendor.audio.feature.keep_alive.enable=true
+vendor.audio.feature.kpi_optimize.enable=true
+vendor.audio.feature.maxx_audio.enable=false
+vendor.audio.feature.ras.enable=true
+vendor.audio.feature.record_play_concurency.enable=false
+vendor.audio.feature.src_trkn.enable=true
+vendor.audio.feature.spkr_prot.enable=true
+vendor.audio.feature.ssrec.enable=true
+vendor.audio.feature.usb_offload.enable=true
+vendor.audio.feature.usb_offload_burst_mode.enable=true
+vendor.audio.feature.usb_offload_sidetone_volume.enable=false
+vendor.audio.feature.deepbuffer_as_primary.enable=false
+vendor.audio.feature.vbat.enable=true
+vendor.audio.feature.wsa.enable=false
+vendor.audio.feature.audiozoom.enable=false
+vendor.audio.feature.snd_mon.enable=true
+
 # ODM
 ro.vendor.qti.va_odm.support=1
--- a/parts/res/xml/clear_speaker_settings.xml
+++ b/parts/res/xml/clear_speaker_settings.xml
@@ -3,7 +3,7 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:title="@string/clear_speaker_title">

-    <SwitchPreferenceCompat
+    <SwitchPreference
        android:key="clear_speaker_pref"
        android:title="@string/clear_speaker_title"
        android:icon="@drawable/ic_clear_speaker"
--- a/parts/res/xml/popup_settings.xml
+++ b/parts/res/xml/popup_settings.xml
@@ -3,14 +3,14 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:title="@string/popup_title">

-    <SwitchPreferenceCompat
+    <SwitchPreference
        android:defaultValue="true"
        android:icon="@drawable/ic_popup_light"
        android:key="popup_led_effect"
        android:summary="@string/popup_led_summary"
        android:title="@string/popup_led_title" />

-    <SwitchPreferenceCompat
+    <SwitchPreference
        android:key="always_on_camera_dialog"
        android:icon="@drawable/ic_always_camera_dialog"
        android:title="@string/always_on_camera_dialog_title"
--- a/parts/src/org/lineageos/settings/popupcamera/PopupCameraSettingsFragment.java
+++ b/parts/src/org/lineageos/settings/popupcamera/PopupCameraSettingsFragment.java
@@ -22,21 +22,21 @@ import android.provider.Settings;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreferenceCompat;
+import androidx.preference.SwitchPreference;

 import org.lineageos.settings.R;

 public class PopupCameraSettingsFragment extends PreferenceFragmentCompat implements
        OnPreferenceChangeListener {

-    private SwitchPreferenceCompat mAlwaysCameraSwitch;
+    private SwitchPreference mAlwaysCameraSwitch;
    public static final String KEY_ALWAYS_CAMERA_DIALOG = "always_on_camera_dialog";

    @Override
    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
        addPreferencesFromResource(R.xml.popup_settings);

-        mAlwaysCameraSwitch = (SwitchPreferenceCompat) findPreference(KEY_ALWAYS_CAMERA_DIALOG);
+        mAlwaysCameraSwitch = (SwitchPreference) findPreference(KEY_ALWAYS_CAMERA_DIALOG);
        boolean enabled = Settings.System.getInt(getContext().getContentResolver(),KEY_ALWAYS_CAMERA_DIALOG, 0) == 1;
        mAlwaysCameraSwitch.setChecked(enabled);
        mAlwaysCameraSwitch.setOnPreferenceChangeListener(this);
--- a/parts/src/org/lineageos/settings/speaker/ClearSpeakerFragment.java
+++ b/parts/src/org/lineageos/settings/speaker/ClearSpeakerFragment.java
@@ -27,7 +27,7 @@ import android.util.Log;

 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.SwitchPreferenceCompat;
+import androidx.preference.SwitchPreference;

 import org.lineageos.settings.R;

@@ -42,7 +42,7 @@ public class ClearSpeakerFragment extends PreferenceFragmentCompat implements

    private Handler mHandler = new Handler(Looper.getMainLooper());
    private MediaPlayer mMediaPlayer;
-    private SwitchPreferenceCompat mClearSpeakerPref;
+    private SwitchPreference mClearSpeakerPref;

    @Override
    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -68,15 +68,15 @@ vendor/lib64/vendor.qti.hardware.dsp@1.0.so
 system_ext/lib/com.qualcomm.qti.ant@1.0.so
 system_ext/lib64/com.qualcomm.qti.ant@1.0.so

-# Alarm (system) - LA.QSSI.13.0.r1-09700-qssi.0
-system_ext/app/PowerOffAlarm/PowerOffAlarm.apk|cbf84c83add302037b8ee9ec0f619f3dccb02f24
-
-# Alarm (system) - LA.UM.9.14.r1-21000-LAHAINA.QSSI12.0
-vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service|cbf84c83add302037b8ee9ec0f619f3dccb02f24
-vendor/bin/power_off_alarm|cbf84c83add302037b8ee9ec0f619f3dccb02f24
-vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc|cbf84c83add302037b8ee9ec0f619f3dccb02f24
-vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so|cbf84c83add302037b8ee9ec0f619f3dccb02f24
-vendor/lib64/vendor.qti.hardware.alarm@1.0.so|cbf84c83add302037b8ee9ec0f619f3dccb02f24
+# Alarm
+-product/app/PowerOffAlarm/PowerOffAlarm.apk;NODEXPO
+vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service
+vendor/bin/power_off_alarm
+vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc
+vendor/lib/hw/vendor.qti.hardware.alarm@1.0-impl.so
+vendor/lib/vendor.qti.hardware.alarm@1.0.so
+vendor/lib64/hw/vendor.qti.hardware.alarm@1.0-impl.so
+vendor/lib64/vendor.qti.hardware.alarm@1.0.so

 # Audio Amplifier
 vendor/firmware/tfa98xx.cnt
@@ -94,6 +94,7 @@ vendor/lib64/soundfx/libqcvirt.so|e6d206594228c8dcc290dd559473984b140499c2
 vendor/lib64/soundfx/libshoebox.so|e7140795d8a8a8dbad64d4282168178d192431a0

 # Audio
+vendor/lib/hw/audio.primary.msmnile.so
 vendor/lib/hw/vendor.qti.hardware.audiohalext@1.0-impl.so
 vendor/lib/libadiertac.so
 vendor/lib/libadm.so
@@ -106,6 +107,7 @@ vendor/lib/libresampler.so
 vendor/lib/libssrec.so
 vendor/lib/vendor.qti.hardware.audiohalext@1.0.so
 vendor/lib/vndk/libxlog.so
+vendor/lib64/hw/audio.primary.msmnile.so
 vendor/lib64/hw/vendor.qti.hardware.audiohalext@1.0-impl.so
 vendor/lib64/libadiertac.so
 vendor/lib64/libaudcal.so
@@ -154,8 +156,8 @@ vendor/lib64/libcdsprpc.so
 vendor/lib64/libsysmon_cdsp_skel.so

 # CNE - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
-vendor/app/CneApp/CneApp.apk;REQUIRED=CneApp.libvndfwk_detect_jni.qti_symlink|345dc6c677e9bd7a7d36033b8955e90d2a1594d5
-vendor/app/IWlanService/IWlanService.apk|9ea57bfbf58799a564fcf498de9f5fe3506f7342
+vendor/app/CneApp/CneApp.apk;NODEXPO;REQUIRED=CneApp.libvndfwk_detect_jni.qti_symlink|345dc6c677e9bd7a7d36033b8955e90d2a1594d5
+vendor/app/IWlanService/IWlanService.apk;NODEXPO|9ea57bfbf58799a564fcf498de9f5fe3506f7342
 vendor/bin/cnd|953858869b513828894800bf8556f3845d9665a2
 vendor/etc/cne/wqeclient/ATT/ATT_profile1.xml|578f3f8f56059bfdbef926bcc68d01c15e06951f
 vendor/etc/cne/wqeclient/ATT/ATT_profile2.xml|1fb42c672a12b6660bdce3ea94e0c43719dd9de8
@@ -187,12 +189,12 @@ vendor/etc/cne/wqeclient/VZW/VZW_profile6.xml|14d136e7fcc682311757d3edc0b9d3eaeb
 vendor/etc/default-permissions/com.qualcomm.qti.cne.xml|c63c37d067e3009735fbc54d4603d43d7d6623e1
 vendor/etc/init/cnd.rc|3a5183df3479500fb729493bc56c71166fc10bce
 vendor/lib/libxml.so|e46a4dd57f543b0cbb897e5d861e987b9f0200bf
-vendor/lib64/libcne.so|e14de8a25090dbf51b12ec5df580987ea2aa21a0
+vendor/lib64/libcne.so;DISABLE_CHECKELF|e14de8a25090dbf51b12ec5df580987ea2aa21a0
 vendor/lib64/libcneapiclient.so|0973dc05f6d6d9c469fc804693af79e6f3a5056a
 vendor/lib64/libcneoplookup.so|60d6abe85061de4fa75e5e4f69d477f37f1f8f64
 vendor/lib64/libcneqmiutils.so|c2e2658698eb8b312ca6b28c1a1088a331bb28b9
 vendor/lib64/libwms.so|1c06f999f2aec3bd58237d4892fee0cec40469fd
-vendor/lib64/libwqe.so|79e58584614ca98773122e9dfa976caf366d2cc5
+vendor/lib64/libwqe.so;DISABLE_CHECKELF|79e58584614ca98773122e9dfa976caf366d2cc5
 vendor/lib64/libxml.so|6d5f9b6be0212bde7b961803fec9302e8529b54a
 vendor/lib64/vendor.qti.data.factory@2.0.so|748bfbaa57a409b8962e2b1725e1415e423a7315
 vendor/lib64/vendor.qti.data.factory@2.1.so|bb1f3fa22563282ee24bf03ca681fdc45551feef
@@ -395,7 +397,7 @@ vendor/lib64/camera/fdconfigpreviewlite.bin
 vendor/lib64/camera/fdconfigvideo.bin
 vendor/lib64/camera/fdconfigvideolite.bin
 vendor/lib64/hw/camera.qcom.so
-vendor/lib64/hw/com.qti.chi.override.so
+vendor/lib64/hw/com.qti.chi.override.so;DISABLE_CHECKELF
 vendor/lib64/libFaceGrade.so
 vendor/lib64/libHalSuperSensorServer.so
 vendor/lib64/libSNPE.so
@@ -404,10 +406,10 @@ vendor/lib64/libSuperSensorCPU.so
 vendor/lib64/libVDClearShot.so
 vendor/lib64/libXMFD_AgeGender.so
 vendor/lib64/lib_denoiser3.so
-vendor/lib64/libalAILDC.so
+vendor/lib64/libalAILDC.so;DISABLE_CHECKELF
 vendor/lib64/libalCFR.so
-vendor/lib64/libalLDC.so
-vendor/lib64/libalhLDC.so
+vendor/lib64/libalLDC.so;DISABLE_CHECKELF
+vendor/lib64/libalhLDC.so;DISABLE_CHECKELF
 vendor/lib64/libarcsat.so
 vendor/lib64/libarcsoft_beautyshot.so
 vendor/lib64/libarcsoft_bodyslim.so
@@ -415,9 +417,9 @@ vendor/lib64/libarcsoft_distortion_correction.so
 vendor/lib64/libarcsoft_dualcam_image_optical_zoom.so
 vendor/lib64/libarcsoft_dualcam_optical_zoom_control.so
 vendor/lib64/libarcsoft_dualcam_refocus.so
-vendor/lib64/libarcsoft_dualcam_refocus_front.so
-vendor/lib64/libarcsoft_dualcam_refocus_rear_t.so
-vendor/lib64/libarcsoft_dualcam_refocus_rear_w.so
+vendor/lib64/libarcsoft_dualcam_refocus_front.so;DISABLE_CHECKELF
+vendor/lib64/libarcsoft_dualcam_refocus_rear_t.so;DISABLE_CHECKELF
+vendor/lib64/libarcsoft_dualcam_refocus_rear_w.so;DISABLE_CHECKELF
 vendor/lib64/libarcsoft_high_dynamic_range.so
 vendor/lib64/libarcsoft_low_light_hdr.so
 vendor/lib64/libarcsoft_portrait_lighting.so
@@ -444,7 +446,7 @@ vendor/lib64/libmialgo_fs.so
 vendor/lib64/libmialgo_rfs.so
 vendor/lib64/libmialgo_sd.so
 vendor/lib64/libmialgo_utils.so
-vendor/lib64/libmialgoengine.so
+vendor/lib64/libmialgoengine.so;DISABLE_CHECKELF
 vendor/lib64/libmibokeh_855.so
 vendor/lib64/libmpbase.so
 vendor/lib64/libnanopb.so
@@ -488,28 +490,28 @@ vendor/lib64/libdlbdsservice.so
 vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so
 vendor/lib64/vendor.dolby.hardware.dms@2.0.so

-# DPM (system) - from LA.QSSI.15.0.r1-14500-qssi.0
-system/framework/tcmclient.jar|de34d4305038f6fcf3cb314fd352ac54cec7e928
-system/lib64/vendor.qti.diaghal-V1-ndk.so|ac3381b74861e15a8fb2842dd8d929c97a5f0fa1
-system_ext/bin/dpmd|bb4195a73a7e8a9abf02fb156cc27b7bb2c3a664
+# DPM (system)  - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
+framework/tcmclient.jar|4e1dfaa243c67fec31b5a44086c9c417892761ae
+system_ext/bin/dpmd|5a42bc4e5c841573579e0718d6e80e688767eeed
 system_ext/etc/dpm/dpm.conf|95e27da8c989e96c6faea6f0697bce11955b62a5
 system_ext/etc/init/dpmd.rc|738b638ff04cda368e22c03e16baf90ba157a6fc
 system_ext/etc/permissions/com.qti.dpmframework.xml|c4b7ad0879d00c1eba4f3fe3a88ddb8aa153629a
 system_ext/etc/permissions/dpmapi.xml|255903759a60a31c0876ec004e74554c753270fe
-system_ext/framework/com.qti.dpmframework.jar|9843c8769469a6d8e3ddcd0aab709bf77c57128e
-system_ext/framework/dpmapi.jar|504f269da33eae85b458dddcc99209f21506ce5c
-system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so|c829dd39d50769ffa52e0eafe722e5e1261aa5e8
-system_ext/lib64/libdiag_system.so|e00fa91ebc18ddaa55b3de979a43e1f0648a13b6
-system_ext/lib64/libdpmctmgr.so|ab4c4ad66e6e27cf29ef98920a028f45c737a40b
-system_ext/lib64/libdpmfdmgr.so|7935031c23d1561d746f1dc6c55983fe47bb5aba
-system_ext/lib64/libdpmframework.so|7728504beca47245f14d4d7b40599d209d73640f
-system_ext/lib64/libdpmtcm.so|9a6093944228ebe7fb1c7387a14cc114853c5278
-system_ext/lib64/vendor.qti.diaghal@1.0.so|f33d7eb1654c5d9acba02376891df1bbe87d3f57
-system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk|158a598891636edcd4a90cfbec65443d2a7161a8
+system_ext/framework/com.qti.dpmframework.jar|4fc38f534c788b80b432b385e07973bdd6e8c98f
+system_ext/framework/dpmapi.jar|c379f7a671439737fbff03411f28891d0f9313c9
+system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so|3e9786c8263de4135926a91083b70a737fc1d28b
+system_ext/lib64/libdpmctmgr.so|206949728b98a513683468209dbce86ed29412b8
+system_ext/lib64/libdpmfdmgr.so|da636fca9a9a91a897d17fd519448b10053a696b
+system_ext/lib64/libdpmframework.so|d974f04f110b3c1a1282d78bb0ff8a29dc022439
+system_ext/lib64/libdpmtcm.so|5521469cac3a2bec3da66cd36637df83ee59b97e
+system_ext/lib64/vendor.qti.diaghal@1.0.so|339886a9895a29dfae15e8708d6eeacda1663908
+system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk;NODEXPO|ebf1f753ed24f8b6ba87c5f27c628889c38d0a85

 # DPM (vendor) - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
 vendor/bin/dpmQmiMgr|e682a4c6e684be96de179158c65e5732f052ab2c
 vendor/etc/init/dpmQmiMgr.rc|1538743661a5c48c15cd105beaad20f72953885a
+vendor/lib/com.qualcomm.qti.dpm.api@1.0.so;MODULE_SUFFIX=_vendor|8e97eba901841227ae7029f535a747fdefd6c369
+vendor/lib/libdpmqmihal.so|843d7bd2dee10e67531deeedc8cbda480c71679f
 vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so;MODULE_SUFFIX=_vendor|d9f1aa7f93b928f42499d613d20ccbc60f279097
 vendor/lib64/libdpmqmihal.so|41eb89e66ba065c43a5eb79cd3c72cef0ee167aa

@@ -531,7 +533,7 @@ vendor/lib/libcppf.so
 vendor/lib/libdrmfs.so
 vendor/lib/librmp.so
 vendor/lib/libtrustedapploader.so
-vendor/lib/mediadrm/libwvdrmengine.so
+vendor/lib/mediadrm/libwvdrmengine.so;DISABLE_CHECKELF
 vendor/lib64/hw/vendor.qti.hardware.qseecom@1.0-impl.so
 vendor/lib64/libGPreqcancel.so
 vendor/lib64/libGPreqcancel_svc.so
@@ -556,17 +558,17 @@ vendor/lib64/libssd.so
 vendor/lib64/libtrustedapploader.so
 vendor/lib64/libtzdrmgenprov.so
 vendor/lib64/libwvhidl.so
-vendor/lib64/mediadrm/libwvdrmengine.so
+vendor/lib64/mediadrm/libwvdrmengine.so;DISABLE_CHECKELF
 vendor/lib64/vendor.qti.hardware.qseecom@1.0.so

 # Display - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
 vendor/lib64/libdisp-aba.so|44993853ff9d4340e856e6f53d802f10372442d3
 vendor/lib64/libdisplayqos.so|5548732c916e629f18f45ce257ce843b679a136a

-# FM (system) - from LA.QSSI.15.0.r1-14500-qssi.0
-system_ext/lib64/fm_helium.so|63a119fb67a51136d738c0fa2b65c6713b3ab077
-system_ext/lib64/libfm-hci.so|96d572c590a04044f0db89356342e64ead887bc4
-system_ext/lib64/vendor.qti.hardware.fm@1.0.so|15f2b7444d7f274d7b90ef7512dd75323b3bc0c5
+# FM (system) - from LA.QSSI.12.0.r1-05800.02-qssi.0
+system_ext/lib64/fm_helium.so|f5c9cc8de62340ab8b38cca2555eeac9ab18d84b
+system_ext/lib64/libfm-hci.so|6fd608b27c9caf5a055c7c29ae386f596f399bc1
+system_ext/lib64/vendor.qti.hardware.fm@1.0.so|b9dc0797da5790a7d5f1c9a7a2fd9c4a7b87d304

 # Fingerprint
 vendor/lib64/hw/fingerprint.goodix_fod.so:vendor/lib64/hw/fingerprint.goodix_fod.msmnile.so;FIX_SONAME
@@ -594,7 +596,7 @@ vendor/lib64/liblocation_api.so
 # GPS - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
 vendor/bin/garden_app|4d5d58b8d8ecbb82db31b6e7f26f9fb749f9393b
 vendor/bin/loc_launcher|515038f060e83db862cca5cc8b79a3eb07d689f4
-vendor/bin/lowi-server|6ec426344a6d6e9896d0f5daba63c9d7d9145528
+vendor/bin/lowi-server;DISABLE_CHECKELF|6ec426344a6d6e9896d0f5daba63c9d7d9145528
 vendor/bin/mlid|b697c6acebe4ed417c1828b8e2dff6f4bc726547
 vendor/bin/slim_daemon|7f4cbbd75f5ef58ddddbace7c0c6477564e87d8a
 vendor/bin/xtra-daemon|fb490d2f3fe4d7ab2c2f976d392d41ab3d7b1e73
@@ -623,7 +625,7 @@ vendor/lib64/liblocationservice_glue.so|d42ee5dd7687abeae596f2621e63fe8540cd0ea4
 vendor/lib64/liblowi_client.so|c2978d2beb8b495f057f88627ee731f7559da388
 vendor/lib64/liblowi_wifihal.so|d8132b8e7f0a3d43ac625fc04dfb033b02ad8adf
 vendor/lib64/libminksocket.so|0722b9042892e83d4c615e0f70e4ad040365b170
-vendor/lib64/libmmosal.so;MODULE_SUFFIX=_vendor|568c9dff1fe27cc4cd874181bf0d8ab5dc6d372b
+vendor/lib64/libmmosal.so|568c9dff1fe27cc4cd874181bf0d8ab5dc6d372b
 vendor/lib64/libqcc_file_agent.so|a05fbdf0156cb4fc77a4b659be42cc8e146f45ce
 vendor/lib64/libqdma_file_agent.so|290aea840cc61b40acd625052ad5ec2f4834e34f
 vendor/lib64/libslimclient.so|74bebb8a94200a4db393634f7bd610f3c59447f7
@@ -644,53 +646,51 @@ vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc|6e6249eb7df66b394
 vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so|564543341a2f98ee2f75b71355e6c02adf6859e7
 vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so|7b0b612fe07a4e8520590e6941e2729227b1702e

-# Graphics (Adreno) - from LA.UM.9.14.r1-20200-LAHAINA.QSSI13.0
-vendor/gpu/kbc/sequence_manifest.bin|cc050a8058904871b3cfabec74521d42f0a61a1f
-vendor/gpu/kbc/unified_kbcs_32.bin|503228f87adc71131aa8134659b00dffe073e973
-vendor/gpu/kbc/unified_kbcs_64.bin|d63c26959dc02b2efc251953e99dc6e7c32e7f6e
-vendor/gpu/kbc/unified_ksqs.bin|8f77dc004796d58acb959e78f4994c5d6b90baef
-vendor/lib/egl/eglSubDriverAndroid.so|a9d540641ac06335bf3689926da50d0408e2863e
-vendor/lib/egl/libEGL_adreno.so;SYMLINK=vendor/lib/libEGL_adreno.so|f77d54d08edbbf13add12518338ff389c873e1cd
-vendor/lib/egl/libGLESv1_CM_adreno.so|f85c647f07feb5e850426b8b04107e6fcbe73a42
-vendor/lib/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib/libGLESv2_adreno.so|bbbf71932164655ecb2126b907e1d9cb2d897ebb
-vendor/lib/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib/libq3dtools_adreno.so|89416a47b7105de1e81d0540c6e2a82ae33b4dda
-vendor/lib/egl/libq3dtools_esx.so|bfbd1e76dc1f81039ffebd6b7534be52173c349d
-vendor/lib/hw/vulkan.adreno.so|bafd65cc8786aeb5bdc12e3c8db09fecdbcb2d01
-vendor/lib/libC2D2.so|bf22239cc4a003a6cd1b3e273f60dc37e4d51730
-vendor/lib/libCB.so|e638447c45228dcb6979e3031da8b3e966dd7482
-vendor/lib/libOpenCL.so|a8a3952c475cf214fec74c324e540ee800ee9727
-vendor/lib/libVkLayer_q3dtools.so|c9953ac8a64b9b9a31173c56812bead633a7d379
-vendor/lib/libadreno_app_profiles.so|a463e2d1f105099ee361bed0ca20c97e29a645c0
-vendor/lib/libadreno_utils.so|0ca6ab39e2757c6c1647682047ca221bd8d1e937
-vendor/lib/libc2d30_bltlib.so|d1f37cf4d50619f59c5b199893fa93f134973647
-vendor/lib/libgpudataproducer.so|2f3348614ea21ed4548154d0ab52ca2256d28e80
-vendor/lib/libgsl.so|3e919532b22d1ba53a9f6141fdb3a9fbd1901f43
-vendor/lib/libkcl.so|4de6a2a00aed99c2f180ae5cf3ec03a96b3be2d7
-vendor/lib/libkernelmanager.so|09e05782cae3b8c5910d069c9d79eb4e58f2801d
-vendor/lib/libllvm-glnext.so|caf1127450a30dfd034398cf142525f505071944
-vendor/lib/libllvm-qcom.so|f7ee34774bbdb3e01a5ecaf9e98ac8f924b710f9
-vendor/lib/vendor.qti.qspmhal@1.0.so;MODULE_SUFFIX=_vendor|736226264356bb89b73d81922f73b7f2b83540bc
-vendor/lib64/egl/eglSubDriverAndroid.so|c950953ab821212322c44497c40f7bec912620a7
-vendor/lib64/egl/libEGL_adreno.so;SYMLINK=vendor/lib64/libEGL_adreno.so|066dc49939ceec71978268737f3a32c8f2aeddf2
-vendor/lib64/egl/libGLESv1_CM_adreno.so|a5ee6c77ea24be2423f661eeddfc868d279d4378
-vendor/lib64/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib64/libGLESv2_adreno.so|e349a692959c6715da4b35e84c82c0eee4b01e00
-vendor/lib64/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib64/libq3dtools_adreno.so|0edfcd0c063a82a4ab29542243a0f842632f31ee
-vendor/lib64/egl/libq3dtools_esx.so|8ba3d0cbe51dff3b860cca48dcd294ccd0816e18
-vendor/lib64/hw/vulkan.adreno.so|c00dfeefef27d950de5a10234cf78b4614521939
-vendor/lib64/libC2D2.so|21a3b027b0857ee910f9db3e7558f35aafaadef5
-vendor/lib64/libCB.so|b578472884e1edf149e9b92d1f518f4de7a6f4d2
-vendor/lib64/libOpenCL.so|688a3a5f3fbece3eddc031e326aa0e3a7e58a091
-vendor/lib64/libVkLayer_q3dtools.so|5ddfe2401db02f851d6472a7ba57c5fc67923675
-vendor/lib64/libadreno_app_profiles.so|cc800fc022c229631a3878c956ad8febf853833d
-vendor/lib64/libadreno_utils.so|af5daa45d0ba961541dc0072f2fe01fee059577f
-vendor/lib64/libc2d30_bltlib.so|870b3b1950b3c918ba73292630d2a3dd1249dda7
-vendor/lib64/libgpudataproducer.so|a2ebbc621637de0a63b5a6663b02575cb394fcda
-vendor/lib64/libgsl.so|e8bcce903c5b03799a8e6c0c868efc0e2c356167
-vendor/lib64/libkcl.so|505c6488d7c2c34ac6bcc578e6e90098553e5f4f
-vendor/lib64/libkernelmanager.so|6e34cfed1b61ef27ac3740cf477e1ed836695513
-vendor/lib64/libllvm-glnext.so|49d28aaf3f7fa559e29a6735ca74cffb20e8eabd
-vendor/lib64/libllvm-qcom.so|ac78556c1a76cd9a7033d775e8f1ba4393b630df
-vendor/lib64/vendor.qti.qspmhal@1.0.so;MODULE_SUFFIX=_vendor|b24925548b969a7745955bbd48069207aa5889fc
+# Graphics (Adreno) - from hollywood-user-12-SQ3A.220605.009.A1-51062550053200150-release-keys & LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
+vendor/lib/egl/eglSubDriverAndroid.so|36794c5177c5d1e4c39b58297a07eb694ce9288c
+vendor/lib/egl/libEGL_adreno.so|6fa7746acee41f5c5b843502e48788b183cf0aff
+vendor/lib/egl/libGLESv1_CM_adreno.so|a8f127209e983ffa427b10fed646bd3741d3c653
+vendor/lib/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib/libGLESv2_adreno.so|530b251b1af116f518007f34d66f0801033c6178
+vendor/lib/egl/libVkLayer_ADRENO_qprofiler.so;SYMLINK=vendor/lib/libVkLayer_ADRENO_qprofiler.so|d4f26d511cd4f98b94c18f145d3246230fbc6d25
+vendor/lib/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib/libq3dtools_adreno.so|381e2d2123f5a6bb1edcc3e281c38acf953ff08b
+vendor/lib/egl/libq3dtools_esx.so|f0018cad37986629ace20146b9ddba5f6882159d
+vendor/lib/hw/vulkan.adreno.so|c16d86d34a72be7a69b19e453a1903925abe16cc
+vendor/lib/libCB.so|6a3cdb29ae4a3bf199c826dd966e6bd7182a1883
+vendor/lib/libOpenCL.so|55d34f35f21e70aafb19c3bfb0edc715ef83c543
+vendor/lib/libOpenCL_adreno.so|b90752ae53d16c9e9cede2b38d4a8109b39217b8
+vendor/lib/libadreno_app_profiles.so|4ad675ed078d0c859fbd82ba32b16acfb00c3447
+vendor/lib/libadreno_utils.so|f8cd5fe4ccf77b211ad379aee5bbf401788f1880
+vendor/lib/libgsl.so|f11778a1870dfbb1c5b6bdd202d938dd0d4ec79b
+vendor/lib/libkcl.so|a504b8d00e87070f7b39a390b5199e971ab3f3e4
+vendor/lib/libkernelmanager.so|9314f26594fbca2c3993b8c91252bffcacb0592b
+vendor/lib/libllvm-glnext.so|b65ee37ba2fb63700ea38dbe39731bf1e51459b2
+vendor/lib/libllvm-qcom.so|c5d5324ceae72f6016020e75d4b8b9dcdde7776d
+vendor/lib/libllvm-qgl.so|0fd44f9a0029a18cbc1cc5aec3562cc0a0d0060e
+vendor/lib64/egl/eglSubDriverAndroid.so|3dabc44583b7d9efae2663f359f2c5d1053d6002
+vendor/lib64/egl/libEGL_adreno.so|860ed2358e89c555b738a0bb578e68da7c00e6c8
+vendor/lib64/egl/libGLESv1_CM_adreno.so|4538678560a8aa062b00f6690e4b268896c1b59d
+vendor/lib64/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib64/libGLESv2_adreno.so|fbc82874ae90a9163257990048cbb077e6828f57
+vendor/lib64/egl/libVkLayer_ADRENO_qprofiler.so;SYMLINK=vendor/lib64/libVkLayer_ADRENO_qprofiler.so|2fa3a828512eadd1afbb132099547d496ba65be2
+vendor/lib64/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib64/libq3dtools_adreno.so|421f7776fda70f2ba8212790e9ac69a3f7288f77
+vendor/lib64/egl/libq3dtools_esx.so|22cc73afe2f8167a0f9953a33ff2eaa465dcfb34
+vendor/lib64/hw/vulkan.adreno.so|f6db97058a3b806367b37b71b9961c00dbbb4f0c
+vendor/lib64/libCB.so|1e1f68f4e954617b8879ca980367ef53e82864a3
+vendor/lib64/libOpenCL.so|98fe18af9ed6b4c366f0d0ca17c707afca57f3a8
+vendor/lib64/libOpenCL_adreno.so|2b1dae0e6b8a8cec153a4b68683c6c3b0da3ce54
+vendor/lib64/libadreno_app_profiles.so|26b8f09515c6b8b30a2c6d250434af6f874ced4e
+vendor/lib64/libadreno_utils.so|fbac8ba895413d3a9ded32226b0f494d33aad6f0
+vendor/lib64/libgsl.so|1420520b888230d4735c2a342314e7c96e649ed5
+vendor/lib64/libkcl.so|ca6e21ab2bffb2513d3c0cd2088fb2112b230833
+vendor/lib64/libkernelmanager.so|b1e5b3860bd2fab9074731c4d24583dfa0897e00
+vendor/lib64/libllvm-glnext.so|c297d4eaf59a52474f629fe049a61161b3dbea63
+vendor/lib64/libllvm-qcom.so|d36b8211b59ff12f9bf5e13d0b4253a77f28d8ac
+vendor/lib64/libllvm-qgl.so|e69f777067b49a4e54970b5d6b0e7622f56c1412
+
+# Graphics (Adreno) - from nabu V13.0.3.0.RKXCNXM
+vendor/lib/libC2D2.so|fafaeb8e08cc62dbad97d1c73af524ae47806c7c
+vendor/lib/libc2d30_bltlib.so;DISABLE_CHECKELF|cbd2c5b449d568f36ef13cd9fa6774e07db4265b
+vendor/lib64/libC2D2.so|fafaeb8e08cc62dbad97d1c73af524ae47806c7c
+vendor/lib64/libc2d30_bltlib.so;DISABLE_CHECKELF|cbd2c5b449d568f36ef13cd9fa6774e07db4265b

 # Graphics (DRM) - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
 vendor/lib64/libsdedrm.so|7cf5f4e7e4dacae88e317d3397fdf25dabe45b65
@@ -724,13 +724,10 @@ vendor/firmware/a640_zap.b01
 vendor/firmware/a640_zap.b02
 vendor/firmware/a640_zap.elf
 vendor/firmware/a640_zap.mdt
-vendor/firmware/a650_gmu.bin
-vendor/firmware/a650_sqe.fw
-vendor/firmware/a650_zap.elf

 # HotwordEnrollment - from MIUI 12.5.2
-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk|62e301d2f386771facd9a9aa546c0fcc241116da
-product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk|8639661f6fad570723bc6f2759da76604bd804fa
+-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk;NODEXPO|62e301d2f386771facd9a9aa546c0fcc241116da
+-product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk;NODEXPO|8639661f6fad570723bc6f2759da76604bd804fa
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml|563a58554d9c0dd0608552b644fbf74519a447bb
 system_ext/framework/com.android.hotwordenrollment.common.util.jar|bef92589e75a6da6043f85f4b9b0e85866429624

@@ -824,9 +821,9 @@ vendor/lib64/vendor.qti.hardware.vpp@1.3.so|85a4e2ca843525db5c76486dbee4c5c7a672

 # Media Codec2 - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
 vendor/bin/hw/vendor.qti.media.c2@1.0-service|83c2effb6f76cb095bae840d95a2026014d92fe9
-vendor/etc/init/vendor.qti.media.c2@1.0-service.rc|03588c8be2ed0c97a3c440bc7f227ce80c2ab7ba
-vendor/lib/libqcodec2.so|c5673b5f377fc855f1467ea2b3c3ed47ca68bbfb
-vendor/lib64/libqcodec2.so|ebcb7ae53c292d689b57450120e280c5797cfaa1
+vendor/etc/init/vendor.qti.media.c2@1.0-service.rc|11209316ba8aae64b689217bc13b0804f6620678
+vendor/lib/libqcodec2.so|ba383c1eca48b29f1e0087970671a55167c96636
+vendor/lib64/libqcodec2.so|ba383c1eca48b29f1e0087970671a55167c96636

 # Mlipay
 vendor/bin/mlipayd@1.1
@@ -925,49 +922,20 @@ vendor/lib64/libGPTEE_vendor.so|92c0215dbd3271e597d536c259df44aac716a402
 vendor/lib64/libQTEEConnector_vendor.so|30e5fd8d4fff50083f44f6d0bd09f4bd287a8366
 vendor/lib64/vendor.qti.hardware.qteeconnector@1.0.so|4e08dcd830d319c1a56d108c037b1f76eb5060d4

-# Radio (IMS) (system) - from LA.QSSI.15.0.r1-14500-qssi.0
-system_ext/app/ImsRcsService/ImsRcsService.apk|8a421431e6dcdadf281a55861c7256e24f6e223c
-system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.0-java.xml|bd9fc166b542b4e730f194ebc996957770d9d497
-system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.1-java.xml|b40fc74f7d5e58b4e918f952b89a79cf2a5c4088
-system_ext/etc/permissions/com.qualcomm.qti.imscmservice-V2.2-java.xml|bfceff47fb0b55a418bed71de6050d876a776ac7
-system_ext/etc/permissions/vendor.qti.ims.rcsservice.xml|c5c9dd633c3f5450f315017cd4645a11de3d7ed3
-system_ext/etc/sysconfig/qti_whitelist_system_ext.xml|fc930929bee7d1f8ecc5b1c76193acdc2f923fe7
-system_ext/framework/com.qualcomm.qti.imscmservice-V2.0-java.jar|00bb25e0327dbd36e0ce1e93da718038460847b4
-system_ext/framework/com.qualcomm.qti.imscmservice-V2.1-java.jar|a801f4a578933d00c15b384ea25e7da25b65b932
-system_ext/framework/com.qualcomm.qti.imscmservice-V2.2-java.jar|53da549a23cc86e87e4bad6d4d4b79fcdda9d2bc
-system_ext/framework/com.qualcomm.qti.uceservice-V2.0-java.jar|4e94741714d816260f400a33fc66799f928ac840
-system_ext/framework/com.qualcomm.qti.uceservice-V2.1-java.jar|74d6447b6219ff39fc9652818de0495dbaee7a59
-system_ext/framework/vendor.qti.ims.callcapability-V1.0-java.jar|43360f4e9a0577597703f7fccb8c1d77cd34a224
-system_ext/framework/vendor.qti.ims.callinfo-V1.0-java.jar|ca8e7f6f907df0852987be296082842cd56cc4e3
-system_ext/framework/vendor.qti.ims.connection-V1.0-java.jar|15781e2856f4da51f548f43de9d3af58c9f49df1
-system_ext/framework/vendor.qti.ims.connectionaidlservice-V1-java.jar|3641e287eaeb8fb936a16cdf260f09719bf0f5d4
-system_ext/framework/vendor.qti.ims.factory-V2.0-java.jar|79e52a4c2fd9bf2b972399568ee84c017b6f24ab
-system_ext/framework/vendor.qti.ims.factory-V2.1-java.jar|9724b39093bb929455beb41a26ae8768694ea343
-system_ext/framework/vendor.qti.ims.factory-V2.2-java.jar|d751e2d8c2c6b8f0345f6e2e70e07c4bd68afc60
-system_ext/framework/vendor.qti.ims.factoryaidlservice-V1-java.jar|5c3c778777f3b6bd22aa14a6c2c2a8b61bc5b656
-system_ext/framework/vendor.qti.ims.rcsconfig-V1.0-java.jar|702b05c430b4e2dfc370b5b08c4b0cd2f069d9cc
-system_ext/framework/vendor.qti.ims.rcssip-V1.0-java.jar|2fee9cd9ac04a08ef10c5aaf039501fcfa4c0395
-system_ext/framework/vendor.qti.ims.rcssip-V1.1-java.jar|f43fc229ebc92235e12e3946fc8325a9fe943c59
-system_ext/framework/vendor.qti.ims.rcssip-V1.2-java.jar|b3fe344e360ef53c9c5d6d925c7b9a0f605a324b
-system_ext/framework/vendor.qti.ims.rcssipaidlservice-V1-java.jar|a7d2a6c9639dfb9dfbdc5361606b419a0384b8d0
-system_ext/framework/vendor.qti.ims.rcsuce-V1.0-java.jar|06b9dfe2c5c65199f3709d9224c33f53bb958594
-system_ext/framework/vendor.qti.ims.rcsuce-V1.1-java.jar|40bd25d668607efb933fecd6265940d89f21057b
-system_ext/framework/vendor.qti.ims.rcsuce-V1.2-java.jar|04f0b4c1ce0bd7ef2fe2153289f5a752c7c1c7cf
-system_ext/framework/vendor.qti.ims.rcsuceaidlservice-V1-java.jar|26388f7cd876286822e536bb76b1277ef1dc76fa
-system_ext/lib64/lib-imsvideocodec.so|b020ec4cc5e360382b7a26f14352bcf19374ad66
-system_ext/lib64/lib-imsvt.so|32fd182fe087a297395f1d6e1d90587a9b97d7c1
-system_ext/lib64/lib-imsvtextutils.so|acce4410add2b5088adab8f7b4e37e36e0c09105
-system_ext/lib64/lib-imsvtutils.so|8a1e06e3edf157b3cba2e608daf70ff0afa823d4
-system_ext/lib64/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimscamera_jni.so|0b61c9104edbcf3284daae09b253b2acbed65ad6
-system_ext/lib64/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimsmedia_jni.so|7616e2b6a8cb3dd2c7c594eed1b16417a1257125
-system_ext/lib64/vendor.qti.ImsRtpService-V1-ndk.so|c27f4e77d677a3e8d1c1c91ca1b40958dfb7f9d6
-system_ext/lib64/vendor.qti.imsrtpservice@3.0.so|961321653e924726bd01af6bfbb33c6740bc66af
-system_ext/lib64/vendor.qti.imsrtpservice@3.1.so|33008343e8ac15821278faecc1c234e8bea3fe2d
-system_ext/priv-app/ims/ims.apk|a7f6f9f5634efa143fe0daa5065d74b91f3e780c
+# Radio (IMS) (system) - from LA.QSSI.12.0.r1-05800.02-qssi.0
+system_ext/lib64/lib-imsvideocodec.so;DISABLE_CHECKELF|ba0a0696b468ee2458c196b3d252656d20eb197f
+system_ext/lib64/lib-imsvt.so|f795cc87119b49587dbb1f3e4349fcf67b0610ed
+system_ext/lib64/lib-imsvtextutils.so|50a092eb7b490f4307bddb3d5a4c595b458bc503
+system_ext/lib64/lib-imsvtutils.so|9a7f904b12a066038c2b5725610e8dd45e3f75ed
+system_ext/lib64/libdiag_system.so|46b48593c913d5cbb05518b31721bb0f33e6c1ba
+system_ext/lib64/libimscamera_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimscamera_jni.so|0394fbe375893f9aa2fee5e28e5c657575025a12
+system_ext/lib64/libimsmedia_jni.so;SYMLINK=system_ext/priv-app/ims/lib/arm64/libimsmedia_jni.so|a8271a46c31ed50a1f7f94d7ec78fb534f432296
+system_ext/lib64/vendor.qti.imsrtpservice@3.0.so|34da5e45ae4817ccff75c6b8d1d0c125ebd253ed
+system_ext/priv-app/ims/ims.apk;NODEXPO|ed68ecd630ddbd49e88bd0b2e3b50ee35c334ef0

 # Radio (IMS) - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
 vendor/bin/ims_rtp_daemon|514b4f3a8483c21526d98634aaf8f01e3a59328a
-vendor/bin/imsdatadaemon|41a10f6f2431a8b2acc29a539f6007aadf43ac26
+vendor/bin/imsdatadaemon;DISABLE_CHECKELF|41a10f6f2431a8b2acc29a539f6007aadf43ac26
 vendor/bin/imsqmidaemon|01cf9da152d3d816b1b2e8ac425cb6e5942bd6b7
 vendor/bin/imsrcsd|bf29aac14856f29268c01599e5f6c7c6ae520685
 vendor/etc/init/ims_rtp_daemon.rc|06510e936890f51aeb76f2cf3ed5dbe45e67ac20
@@ -1016,14 +984,14 @@ vendor/lib64/vendor.qti.ims.rcsconfig@2.1.so|f52f0cd5e19455eba97dea61542217d4aa5
 vendor/lib64/vendor.qti.imsrtpservice@3.0-service-Impl.so|4fc84ea2ec56396fa1d6daa9c8f06b227be403a4
 vendor/lib64/vendor.qti.imsrtpservice@3.0.so;MODULE_SUFFIX=_vendor|460e589128fce0b0e83bb3c75aa32f7e1a9494fd

-# Radio (system) - from LA.QSSI.15.0.r1-14500-qssi.0
-system_ext/app/DeviceInfo/DeviceInfo.apk|58e0b5831244827e05afedbb468fb69942a5e4c1
-system_ext/app/QtiTelephonyService/QtiTelephonyService.apk|d5829c38c2370cb9acd8b3753d62cef709815614
+# Radio (system) - from LA.QSSI.12.0.r1-05800.02-qssi.0
+product/etc/permissions/telephony_product_privapp-permissions-qti.xml|42f4553b61731e56d253766554d4479519cea3ff
+system_ext/app/QtiTelephonyService/QtiTelephonyService.apk;NODEXPO|a32f88ddcc8f9cba18aa5697ee5bd52201e89b13
 system_ext/etc/permissions/qcrilhook.xml|30397e293b2c40e6b7a1d11c2a615cdd05de625a
-system_ext/etc/permissions/telephony_system-ext_privapp-permissions-qti.xml|e4d155e1ba9b6b6b215eec7d70004cba6b6176e5
-system_ext/framework/qcrilhook.jar|9787a32278ef29754c0b0fe665c6dae883c8e9c2
-system_ext/framework/qti-telephony-common.jar|b10ad976bce39212eea726ad6b9dbf61c90d76b4
-system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk|f44654156c1c6689044ccdd1af56d49a90716572
+system_ext/etc/permissions/telephonyservice.xml|b7831598d3c19c6ce4ef431d1cc44d94c3c35a8d
+system_ext/framework/qcrilhook.jar|f2888f922b8347417dfa86741feb8348795fce6f
+system_ext/framework/qti-telephony-common.jar|a22ed88e0cd81ea8c4788c26494c8b5fd666ec7c
+system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk;NODEXPO|60af440aae61fcd6939af56a0b94d9b9ef5ebd55

 # Radio (vendor) - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
 vendor/bin/ATFWD-daemon|98b712409955b49330f7e179da8019be723850a3
@@ -1203,7 +1171,7 @@ vendor/lib64/libscveObjectTracker.so|0cf7d3128ae0019d882da5c9d8d9186d549177d1
 vendor/lib64/libscveObjectTracker_stub.so|6f45aa215de07dfeacf811c06af750206bb1cf58

 # Soter
-vendor/app/SoterService/SoterService.apk
+-app/SoterService/SoterService.apk;NODEXPO
 vendor/bin/hw/vendor.qti.hardware.soter@1.0-service
 vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc
 vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so
@@ -1212,14 +1180,14 @@ vendor/lib64/vendor.qti.hardware.soter@1.0.so
 # Subsystem
 vendor/bin/ssr_setup

-# Thermal - from barbet 12 S2B2.211203.006-8015633
-vendor/lib64/libthermalclient.so|0a12301d1557583db10f730d1d3cced841448b99
-
 # Thermal - from coral-user-12-SQ1A.220105.002-7961164-release-keys
 vendor/bin/thermal-engine|01cb7dc998c39016b54089c18921ad7d65b3c675

+# Thermal - from barbet 12 S2B2.211203.006-8015633
+vendor/lib64/libthermalclient.so|0a12301d1557583db10f730d1d3cced841448b99
+
 # Time - from LA.UM.9.1.r1-13700-SMxxx0.QSSI13.0
-vendor/app/TimeService/TimeService.apk|92317b3b72586489456d37057b4c3c8e55863923
+vendor/app/TimeService/TimeService.apk;NODEXPO|92317b3b72586489456d37057b4c3c8e55863923
 vendor/bin/time_daemon|48401d7f85c87aa3e12ce7b4a969a50cbf59c293
 vendor/etc/init/init.time_daemon.rc|b253ca2a498757e14e1d7a051bf504ae09218f51
 vendor/lib64/libtime_genoff.so|8bb116ad297a5e4a94da2f10509509cb6e863a5f
@@ -1229,77 +1197,6 @@ vendor/bin/hw/vendor.qti.hardware.tui_comm@1.0-service-qti|15378114c18fd1b1c8f96
 vendor/etc/init/vendor.qti.hardware.tui_comm@1.0-service-qti.rc|2cfc563d7e1579374f001c94588fae7835a12ffc
 vendor/lib64/vendor.qti.hardware.tui_comm@1.0.so|4ba792ee3234dca4cd7ebbd7b3f9003c800f51b4

-# WiFi Display (system) - from dada OS2.0.217.0.WOCMIXM
-system/framework/WfdCommon.jar|76fab5ed43206989057284fa26e8b894f1da102f
-system_ext/bin/wfdservice64:system_ext/bin/wfdservice|34851904d02d11d3cfebbc7b8745a9444ba3e7c5
-system_ext/etc/init/wfdservice.rc|907def8565d8f91f531ca7dfad880af05d540b0c
-system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml|6669d5ee462c981663b8ac573d84d334e4eed96c
-system_ext/etc/seccomp_policy/wfdservice64.policy|1e331272649395423b11c575892e0bdc9433b820
-system_ext/lib/libmmosal.so|d54f22775394bbe0668f0f40fd310d8b38945405
-system_ext/lib/libmmparser_lite.so|82f4efae857bca5a3206e4c2189340e58054164c
-system_ext/lib64/libmmosal.so|d46f10b470ecd829c6f2a424566f1cbbc6ebe234
-system_ext/lib64/libmmparser_lite.so|924943141df2f070a9c04a614ce43c370b3b222e
-system_ext/lib64/libmmrtpdecoder.so|8b143c0b004a2f5ab8d7911dd463de0ceea794e7
-system_ext/lib64/libmmrtpencoder.so|eef3f64e6c2892fc0c87e176f5a83f7fe07761d3
-system_ext/lib64/libwfdavenhancements.so|8c968c6930e44901ef8c6abd6356f2308600d90e
-system_ext/lib64/libwfdclient.so|2d1bf9b010ecfb8532eaf6a12c8bf60f9e8ffe08
-system_ext/lib64/libwfdcommonutils.so|3ae375016a9551e51f26710e8b07d20eeef2b76f
-system_ext/lib64/libwfdconfigutils.so|4d8200cc4c455f54fcbce927f5cabeb7b591f5d0
-system_ext/lib64/libwfddisplayconfig.so|27f5d6e284edf05cc7776e5be010912973000ab9
-system_ext/lib64/libwfdmminterface.so|8d3d493fef797aef2feaab4e09e50250ddf5dc9a
-system_ext/lib64/libwfdmmsink.so|4569ce9941eb5d06db599146ed80b8a32d7cd97f
-system_ext/lib64/libwfdmmsrc_system.so|0cc970954800566baddbf760b153b027940180f5
-system_ext/lib64/libwfdnative.so;SYMLINK=system_ext/priv-app/WfdService/lib/arm64/libwfdnative.so|9513bbbd813dd05fb063d3c9e72640a1bc9156c2
-system_ext/lib64/libwfdrtsp.so|1ab4fc5b75d25f551df3593d5856e6f7893a4176
-system_ext/lib64/libwfdservice.so|af0e31f17ed997a5d8bad64cdad486be28cb9f07
-system_ext/lib64/libwfdsinksm.so|cc899b719fa11d844c65908d7fdc18600451324d
-system_ext/lib64/libwfduibcinterface.so|432d54b072d8f1c80409b6e11f4f833ca9576937
-system_ext/lib64/libwfduibcsink.so|d12b05bbcefdff6addc2c31567a656b7540d7489
-system_ext/lib64/libwfduibcsinkinterface.so|a41b4d1fa4307a247b1f059a5b5cdf7f6a645db3
-system_ext/lib64/libwfduibcsrc.so|5be7d282be9ab45297bd030f8e37a45f48aa8677
-system_ext/lib64/libwfduibcsrcinterface.so|0e32acc87c8518e8ebb44f6ef341a2e278e1e7c2
-system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so|2b2563450ad6a8d46d5648b97f63f87c5d9983ca
-system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so|58cd9358df40aa16ddf0e603b736c58588623b9e
-system_ext/priv-app/WfdService/WfdService.apk|b8a1d9f83804d274fab6e09e0607082801207f60
-
-# WiFi Display (vendor) - from sweet_k6a OS1.0.19.0.THGMIXM
-vendor/bin/wfdvndservice|194bb3aef5237f05d0c8fab2c88846147a6cc55a
-vendor/bin/wifidisplayhalservice|36bddae1febbee1bb53a80646d17c0fe36199757
-vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc|c266f08783a17f6583e3f22c85e55b0c200442ea
-vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc|576ce4393b7746b77a230745aa9e9ee3bd31b17d
-vendor/etc/init/wfdvndservice.rc|42e28fb8e0bf00620d7b9939b5bd3164ca671033
-vendor/etc/seccomp_policy/wfdhdcphalservice.policy|23b46af886f3233c2bddff87507ae8d37c31c022
-vendor/etc/seccomp_policy/wfdvndservice.policy|b46f0c22a1f9b65c6750205e161c0a3f84ac716b
-vendor/etc/seccomp_policy/wifidisplayhalservice.policy|698f46d3a3b89be125e2fe88439c770e5c647037
-vendor/etc/wfdconfig.xml|9e13371f7ae509cc0bbb3f2ace93c5ea5d87bf0f
-vendor/lib/libFileMux_proprietary.so|b1e2801f2be356ff88bf5d6269ef7f9c655dff67
-vendor/lib/libmm-hdcpmgr.so|057fc29807be0f2527c3026d01dff98cfe9018ad
-vendor/lib/libmmosal.so;MODULE_SUFFIX=_vendor|6f71fd1d54d6ca8df7d362a72517b082ed412bbe
-vendor/lib/libmmrtpdecoder_proprietary.so|d15b2eed6333693d40cd3d96e56873f707e889ff
-vendor/lib/libmmrtpencoder_proprietary.so|997e08f2c9bd8ca971105f7afacc886853e2abae
-vendor/lib/libwfdcodecv4l2_proprietary.so|871d4ea5842cf46ab4e28b6c245229352090ae0e
-vendor/lib/libwfdcommonutils_proprietary.so|585527a3d010a0da02f3995aff3866493fc8bbf4
-vendor/lib/libwfdconfigutils_proprietary.so|acaeb47249f02eec08a70c07cd413ddbd5a77b6b
-vendor/lib/libwfddisplayconfig_proprietary.so|f24b3956a71df1f9602a0cfd486616e4f79c01bf
-vendor/lib/libwfdhdcpcp.so|92ea12f382eb63a96c3dafbecf7d90bf91d5b5e8
-vendor/lib/libwfdhdcpservice_proprietary.so|2c0e1cc8f1b601bb5f3ea30261bf18718c81da91
-vendor/lib/libwfdmminterface_proprietary.so|afb38905fdc951985357765e830e2a14720ce668
-vendor/lib/libwfdmmservice_proprietary.so|3e813eceb99e6c82184fad95a88ac5fe6a877a7d
-vendor/lib/libwfdmmsrc_proprietary.so|6897735c19ab2c58671331eb9c060bb3116e2caf
-vendor/lib/libwfdmodulehdcpsession.so|11f859b6bc89f3123c0ea3bf7b6cda3700443907
-vendor/lib/libwfdrtsp_proprietary.so|86ed13764a23e52b37784019a11ed57c91fbb4cc
-vendor/lib/libwfdsessionmodule.so|f61fd1dbf458198cae00a8175d489ae73aab7f7e
-vendor/lib/libwfdsourcesession_proprietary.so|1023f7930bd892ae4617719d6c5bc5a1e992f35f
-vendor/lib/libwfdsourcesm_proprietary.so|6cf1e24bb6f8c20ecd6a89a2cfe32b8b51554358
-vendor/lib/libwfduibcinterface_proprietary.so|6c58302aa9d8b8ff044c6e79ddfb5ef9ce01b57e
-vendor/lib/libwfduibcsink_proprietary.so|677bbedf0beed487348d9792cdfe4cde3062d33f
-vendor/lib/libwfduibcsinkinterface_proprietary.so|c8b59137820fc3d27d9186b57bbcb8b06bc80299
-vendor/lib/libwfduibcsrc_proprietary.so|c89cd0772f8fdea83fec1feae66ca635aa0b563d
-vendor/lib/libwfduibcsrcinterface_proprietary.so|826a3a7c9f81e63abe1cf805e6abca2d1e6e0afb
-vendor/lib/libwfdutils_proprietary.so|48c3b03eb30c6eec6cf53789393faa0dfb3d5142
-vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so;MODULE_SUFFIX=_vendor|1c38bab7199c0ebd418749b16dc8e10610eaf17c
-vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so|a964ebf868307e4ef84c614154184d9c3afe8c86
-
 # WiFi
 vendor/bin/cnss-daemon
 vendor/bin/nv_mac
--- a/reorder-libs.py
+++ b/reorder-libs.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2021 The LineageOS Project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from functools import cmp_to_key
+from locale import LC_ALL, setlocale, strcoll
+from pathlib import Path
+
+FILES = [Path(file) for file in [
+    "proprietary-files.txt",
+]]
+
+setlocale(LC_ALL, "C")
+
+def strcoll_extract_utils(string1: str, string2: str) -> int:
+    # Skip logic if one of the string if empty
+    if not string1 or not string2:
+        return strcoll(string1, string2)
+
+    # Remove '-' from strings if there,
+    # it is used to indicate a build target
+    string1 = string1.removeprefix('-')
+    string2 = string2.removeprefix('-')
+
+    # If no directories, compare normally
+    if not "/" in string1 and not "/" in string2:
+        return strcoll(string1, string2)
+
+    string1_dir = string1.rsplit("/", 1)[0] + "/"
+    string2_dir = string2.rsplit("/", 1)[0] + "/"
+    if string1_dir == string2_dir:
+        # Same directory, compare normally
+        return strcoll(string1, string2)
+
+    if string1_dir.startswith(string2_dir):
+        # First string dir is a subdirectory of the second one,
+        # return string1 > string2
+        return -1
+
+    if string2_dir.startswith(string1_dir):
+        # Second string dir is a subdirectory of the first one,
+        # return string2 > string1
+        return 1
+
+    # Compare normally
+    return strcoll(string1, string2)
+
+for file in FILES:
+    if not file.is_file():
+        print(f"File {str(file)} not found")
+        continue
+
+    with open(file, 'r') as f:
+        sections = f.read().split("\n\n")
+
+    ordered_sections = []
+    for section in sections:
+        section_list = [line.strip() for line in section.splitlines()]
+        section_list.sort(key=cmp_to_key(strcoll_extract_utils))
+        ordered_sections.append("\n".join(section_list))
+
+    with open(file, 'w') as f:
+        f.write("\n\n".join(ordered_sections).strip() + "\n")
--- a/rro_overlays/FrameworksResRaphael/res/values/config.xml
+++ b/rro_overlays/FrameworksResRaphael/res/values/config.xml
@@ -429,29 +429,28 @@

    <!-- Default list of files pinned by the Pinner Service -->
    <string-array translatable="false" name="config_defaultPinnerServiceFiles">
-        <item>"/apex/com.android.art/javalib/core-oj.jar"</item>
-	<item>"/apex/com.android.art/javalib/core-libart.jar"</item>
-	<item>"/system/lib64/libEGL.so"</item>
+        <item>"/system/bin/surfaceflinger"</item>
+        <item>"/system/framework/framework.jar"</item>
+        <item>"/system/framework/services.jar"</item>
+        <item>"/system/lib64/libEGL.so"</item>
        <item>"/system/lib64/libGLESv2.so"</item>
        <item>"/system/lib64/libhwui.so"</item>
+        <item>"/system/system_ext/priv-app/SystemUIGoogle/SystemUIGoogle.apk"</item>
        <item>"/vendor/lib64/egl/libEGL_adreno.so"</item>
        <item>"/vendor/lib64/egl/libGLESv2_adreno.so"</item>
        <item>"/vendor/lib64/libCB.so"</item>
        <item>"/vendor/lib64/libgsl.so"</item>
+        <item>"/vendor/lib64/libllvm-glnext.so"</item>
        <item>"/vendor/lib64/libllvm-qcom.so"</item>
-	<item>"/vendor/lib64/hw/fingerprint.goodix_fod.msmnile.so"</item>
-        <item>"/system/framework/framework.jar"</item>
-        <item>"/system/framework/services.jar"</item>
-        <item>"/system/bin/surfaceflinger"</item>
-        <item>"/system_ext/priv-app/SystemUI/SystemUI.apk"</item>
+        <item>"/vendor/lib64/libllvm-qgl.so"</item>
+        <item>"/vendor/lib64/hw/fingerprint.goodix_fod.msmnile.so"</item>
+        <item>"/apex/com.android.art/javalib/core-oj.jar"</item>
+        <item>"/apex/com.android.art/javalib/core-libart.jar"</item>
    </string-array>

    <!-- Bytes that the PinnerService will pin for Home app -->
    <integer name="config_pinnerHomePinBytes">6291456</integer>

-    <!-- Bytes that the PinnerService will pin for WebView -->
-    <integer name="config_pinnerWebviewPinBytes">20971520</integer>
-
    <!--  Maximum number of supported users -->
    <integer name="config_multiuserMaximumUsers">4</integer>

@@ -600,26 +599,9 @@
    <!-- Type of the tap sensor. Empty if tap is not supported. -->
    <string name="config_dozeTapSensorType" translatable="false">org.lineageos.sensor.single_tap</string>

-    <!-- Auto-brightness sensor type string -->
-    <string name="config_displayLightSensorType">"android.sensor.light"</string>
-
    <!-- Whether device supports increased touch sensitvity -->
    <bool name="config_supportGloveMode">true</bool>

    <!-- Whether the new Auto Selection Network UI should be shown -->
    <bool name="config_enableNewAutoSelectNetworkUI">true</bool>
-
-    <!-- Number of physical SIM slots on the device. This includes both eSIM and pSIM slots, and
-         is not necessarily the same as the number of phones/logical modems supported by the device.
-         For example, a multi-sim device can have 2 phones/logical modems, but 3 physical slots,
-         or a single SIM device can have 1 phones/logical modems, but 2 physical slots (one eSIM
-         and one pSIM) -->
-    <integer name="config_num_physical_slots">2</integer>
-
-    <!-- Whether to enable fp unlock when screen turns off on udfps devices -->
-    <bool name="config_screen_off_udfps_enabled">true</bool>
-
-    <!-- Default value for fp screen off unlock toggle, it only works for the devices that support
-         fp screen off unlock-->
-    <bool name="config_screen_off_udfps_default_on">true</bool>
 </resources>
--- a/rro_overlays/TelephonyResCommon/res/values/config.xml
+++ b/rro_overlays/TelephonyResCommon/res/values/config.xml
@@ -29,7 +29,7 @@
    <string name="config_ims_mmtel_package" translatable="false">org.codeaurora.ims</string>

    <!-- String indicating the package name of the device ImsService implementation for RCS. -->
-    <string name="config_ims_rcs_package" translatable="false">vendor.qti.imsrcs</string>
+    <string name="config_ims_rcs_package" translatable="false">org.codeaurora.ims</string>

    <!-- Package name for the call-based number verification app -->
    <string name="platform_number_verification_package" translatable="false">com.google.android.gms</string>
--- a/sepolicy/private/seapp_contexts
+++ b/sepolicy/private/seapp_contexts
@@ -1,3 +1 @@
 user=system seinfo=platform name=org.lineageos.settings domain=xiaomiparts_app type=system_app_data_file
-
-user=bluetooth seinfo=default name=com.android.bluetooth domain=bluetooth type=bluetooth_data_file levelFrom=all isPrivApp=true
--- a/sepolicy/vendor/file_contexts
+++ b/sepolicy/vendor/file_contexts
@@ -47,6 +47,9 @@
 # LEDs
 /sys/devices/platform/soc/[a-z0-9]+.qcom,spmi/spmi-[0-1]/spmi0-0[0-9]/[a-z0-9]+.qcom,spmi:qcom,[a-z0-9]+@[0-9]:qcom,leds@d000/leds(/.*)?    u:object_r:sysfs_leds:s0

+# Livedisplay
+/vendor/bin/hw/vendor\.lineage\.livedisplay@2\.1-service\.raphael    u:object_r:hal_lineage_livedisplay_qti_exec:s0
+
 # MAC
 /vendor/bin/nv_mac                                              u:object_r:vendor_wcnss_service_exec:s0
 /data/vendor/mac_addr(/.*)?                                     u:object_r:vendor_wifi_vendor_data_file:s0
--- a/sepolicy/vendor/genfs_contexts
+++ b/sepolicy/vendor/genfs_contexts
@@ -108,10 +108,13 @@ genfscon sysfs /devices/platform/soc/a94000.i2c/i2c-4/4-0038/wakeup
 genfscon sysfs /devices/platform/soc/a94000.i2c/i2c-4/4-0048/wakeup                                                                                u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/abb0000.qcom,cvpss/wakeup                                                                                     u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/b0000000.qcom,cnss-qca6390/wakeup                                                                             u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-00/c440000.qcom,spmi:qcom,pm8150@0:qcom,power-on@800/wakeup                    u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/power_supply/wireless/wakeup u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,qpnp-smb5/wakeup                      u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,sdam-qnovo@b000/wakeup                u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:qcom,usb-pdphy@1700/usbpd/usbpd0/otg_default/wakeup u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-02/c440000.qcom,spmi:qcom,pm8150b@2:vadc@3100/iio:device1/wakeup               u:object_r:sysfs_wakeup:s0
+genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-04/c440000.qcom,spmi:qcom,pm8150l@4:qcom,power-on@800/wakeup                   u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/c440000.qcom,spmi/spmi-0/spmi0-08/c440000.qcom,spmi:qcom,pmxprairie@8:qcom,power-on@800/wakeup                u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/c80000.i2c/i2c-4/4-003b/power_supply/idt/wakeup                                                               u:object_r:sysfs_wakeup:s0
 genfscon sysfs /devices/platform/soc/c80000.i2c/i2c-4/4-003b/wakeup                                                                                u:object_r:sysfs_wakeup:s0
--- a/sepolicy/vendor/hal_graphics_composer_default.te
+++ b/sepolicy/vendor/hal_graphics_composer_default.te
@@ -0,0 +1,3 @@
+hal_client_domain(hal_graphics_composer_default, hal_power)
+binder_call(hal_graphics_composer_default, hal_power_service);
+binder_call(hal_graphics_composer_default, hal_power_default);
--- a/sepolicy/vendor/hal_lineage_livedisplay_qti.te
+++ b/sepolicy/vendor/hal_lineage_livedisplay_qti.te
@@ -0,0 +1,3 @@
+allow hal_lineage_livedisplay_qti vendor_sysfs_hbm:file rw_file_perms;
+allow hal_lineage_livedisplay_qti vendor_sysfs_graphics:dir r_dir_perms;
+allow hal_lineage_livedisplay_qti vendor_sysfs_graphics:file rw_file_perms;
--- a/setup-makefiles.py
+++ b/setup-makefiles.py
@@ -1 +0,0 @@
-#!./extract-files.py --regenerate_makefiles
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=raphael
+VENDOR=xiaomi
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+
+function vendor_imports() {
+    cat <<EOF >>"$1"
+	"device/xiaomi/raphael",
+	"hardware/qcom-caf/sm8150",
+	"hardware/qcom-caf/wlan",
+	"hardware/xiaomi",
+	"vendor/qcom/opensource/dataservices",
+	"vendor/qcom/opensource/commonsys-intf/display",
+	"vendor/qcom/opensource/commonsys/display",
+	"vendor/qcom/opensource/display",
+EOF
+}
+
+function lib_to_package_fixup_vendor_variants() {
+    if [ "$2" != "vendor" ]; then
+        return 1
+    fi
+    case "$1" in
+            com.qualcomm.qti.dpm.api@1.0 | \
+	    vendor.qti.hardware.fm@1.0 | \
+	    vendor.qti.imsrtpservice@3.0)
+            echo "${1}_vendor"
+            ;;
+            libgrallocutils | \
+	    libwfdaac_vendor | \
+            libwpa_client) ;;
+        *)
+            return 1
+            ;;
+    esac
+}
+function lib_to_package_fixup() {
+    lib_to_package_fixup_clang_rt_ubsan_standalone "$1" ||
+        lib_to_package_fixup_proto_3_9_1 "$1" ||
+        lib_to_package_fixup_vendor_variants "$@"
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
+
+# Warning headers and guards
+write_headers
+
+write_makefiles "${MY_DIR}/proprietary-files.txt" true
+
+# Finish
+write_footers
--- a/tfa98xx/Android.bp
+++ b/tfa98xx/Android.bp
@@ -1,37 +0,0 @@
-//
-// SPDX-FileCopyrightText: 2020-2025 The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-cc_library_shared {
-    name: "audio_amplifier.msmnile",
-    relative_install_path: "hw",
-    vendor: true,
-    owner: "qti",
-
-    srcs: [
-        "tfa98xx_feedback.c",
-    ],
-
-    include_dirs: [
-        "external/tinyalsa/include",
-        "external/tinycompress/include",
-        "hardware/qcom-caf/sm8150/audio/hal",
-        "hardware/qcom-caf/sm8150/audio/hal/audio_extn",
-        "hardware/qcom-caf/sm8150/audio/hal/msm8974",
-        "system/media/audio_route/include",
-        "system/media/audio_utils/include",
-    ],
-
-    header_libs: [
-        "libhardware_headers",
-        "qti_kernel_headers",
-    ],
-
-    shared_libs: [
-        "libdl",
-        "libhardware",
-        "liblog",
-        "libtinyalsa",
-    ],
-}
--- a/tfa98xx/tfa98xx_feedback.c
+++ b/tfa98xx/tfa98xx_feedback.c
@@ -1,215 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod Open Source Project
- * Copyright (C) 2020-2025 The LineageOS 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.
- */
-
-#define LOG_TAG "audio_amplifier_tfa98xx"
-
-#include <dlfcn.h>
-#include <log/log.h>
-#include <system/audio.h>
-
-#include "platform.h"
-#include "platform_api.h"
-
-/* clang-format off */
-#define is_spkr_out_snd_dev(x) \
-    (((x) == SND_DEVICE_OUT_SPEAKER) || \
-    ((x) == SND_DEVICE_OUT_SPEAKER_REVERSE) || \
-    ((x) == SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES) || \
-    ((x) == SND_DEVICE_OUT_SPEAKER_AND_ANC_HEADSET) || \
-    ((x) == SND_DEVICE_OUT_SPEAKER_AND_HDMI) || \
-    ((x) == SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET) || \
-    ((x) == SND_DEVICE_OUT_VOICE_SPEAKER) || \
-    ((x) == SND_DEVICE_OUT_VOICE_SPEAKER_2))
-/* clang-format on */
-
-typedef struct amp_device {
-    amplifier_device_t amp_dev;
-    struct audio_device* adev;
-    struct audio_usecase* usecase_tx;
-    struct pcm* tfa98xx_out;
-    const struct hw_module_t* module_ahal;
-    typeof(enable_snd_device)* enable_snd_device;
-    typeof(enable_audio_route)* enable_audio_route;
-    typeof(disable_snd_device)* disable_snd_device;
-    typeof(disable_audio_route)* disable_audio_route;
-    typeof(platform_get_pcm_device_id)* platform_get_pcm_device_id;
-    typeof(get_usecase_from_list)* get_usecase_from_list;
-} tfa_t;
-
-static tfa_t* tfa_dev = NULL;
-
-static struct pcm_config pcm_config_tfa98xx = {
-        .channels = 2,
-        .rate = 48000,
-        .period_size = 256,
-        .period_count = 4,
-        .format = PCM_FORMAT_S16_LE,
-        .start_threshold = 0,
-        .stop_threshold = INT_MAX,
-        .avail_min = 0,
-};
-
-static int amp_set_feedback(amplifier_device_t* device, void* adev, uint32_t snd_device,
-                            bool enable) {
-    if (!device) return 0;
-
-    tfa_dev->adev = (struct audio_device*)adev;
-    int pcm_dev_tx_id = 0, rc = 0;
-
-    if (!tfa_dev->adev) {
-        ALOGE("%d: Invalid params", __LINE__);
-        return -EINVAL;
-    }
-
-    if (!is_spkr_out_snd_dev(snd_device)) return 0;
-
-    if (!enable) goto disable;
-
-    if (tfa_dev->tfa98xx_out) return 0;
-
-    tfa_dev->usecase_tx = (struct audio_usecase*)calloc(1, sizeof(struct audio_usecase));
-    if (!tfa_dev->usecase_tx) {
-        ALOGE("%d: failed to allocate memory for usecase", __LINE__);
-        return -ENOMEM;
-    }
-    tfa_dev->usecase_tx->id = USECASE_AUDIO_SPKR_CALIB_TX;
-    tfa_dev->usecase_tx->type = PCM_CAPTURE;
-    tfa_dev->usecase_tx->in_snd_device = SND_DEVICE_IN_CAPTURE_VI_FEEDBACK;
-    list_init(&tfa_dev->usecase_tx->device_list);
-
-    list_add_head(&tfa_dev->adev->usecase_list, &tfa_dev->usecase_tx->list);
-    tfa_dev->enable_snd_device(tfa_dev->adev, tfa_dev->usecase_tx->in_snd_device);
-    tfa_dev->enable_audio_route(tfa_dev->adev, tfa_dev->usecase_tx);
-
-    pcm_dev_tx_id =
-            tfa_dev->platform_get_pcm_device_id(tfa_dev->usecase_tx->id, tfa_dev->usecase_tx->type);
-    ALOGD("pcm_dev_tx_id = %d", pcm_dev_tx_id);
-    if (pcm_dev_tx_id < 0) {
-        ALOGE("%d: Invalid pcm device for usecase (%d)", __LINE__, tfa_dev->usecase_tx->id);
-        rc = -ENODEV;
-        goto disable;
-    }
-
-    tfa_dev->tfa98xx_out =
-            pcm_open(tfa_dev->adev->snd_card, pcm_dev_tx_id, PCM_IN, &pcm_config_tfa98xx);
-    if (!pcm_is_ready(tfa_dev->tfa98xx_out)) {
-        ALOGE("%d: %s", __LINE__, pcm_get_error(tfa_dev->tfa98xx_out));
-        rc = -EIO;
-        goto disable;
-    }
-
-    rc = pcm_start(tfa_dev->tfa98xx_out);
-    if (rc < 0) {
-        ALOGE("%d: pcm start for TX failed", __LINE__);
-        rc = -EINVAL;
-        goto disable;
-    }
-
-    ALOGD("%s: Started tfa98xx feedback successfully", __func__);
-
-    return 0;
-
-disable:
-    ALOGV("%s: Disabling usecase", __func__);
-    if (tfa_dev->tfa98xx_out) {
-        pcm_close(tfa_dev->tfa98xx_out);
-        tfa_dev->tfa98xx_out = NULL;
-    }
-    tfa_dev->usecase_tx = tfa_dev->get_usecase_from_list(tfa_dev->adev, tfa_dev->usecase_tx->id);
-    if (tfa_dev->usecase_tx) {
-        ALOGD("%s: Disabling tfa98xx feedback", __func__);
-        list_remove(&tfa_dev->usecase_tx->list);
-        tfa_dev->disable_snd_device(tfa_dev->adev, tfa_dev->usecase_tx->in_snd_device);
-        tfa_dev->disable_audio_route(tfa_dev->adev, tfa_dev->usecase_tx);
-        free(tfa_dev->usecase_tx);
-    }
-    return rc;
-}
-
-static int amp_dev_close(hw_device_t* device) {
-    tfa_t* dev = (tfa_t*)device;
-    if (dev) free(dev);
-
-    return 0;
-}
-
-static int amp_module_open(const hw_module_t* module, const char* name, hw_device_t** device) {
-    if (strcmp(name, AMPLIFIER_HARDWARE_INTERFACE)) {
-        ALOGE("%s:%d: %s does not match amplifier hardware interface name\n", __func__, __LINE__,
-              name);
-        return -ENODEV;
-    }
-
-    tfa_dev = calloc(1, sizeof(tfa_t));
-    if (!tfa_dev) {
-        ALOGE("%s:%d: Unable to allocate memory for amplifier device\n", __func__, __LINE__);
-        return -ENOMEM;
-    }
-
-    tfa_dev->amp_dev.common.tag = HARDWARE_DEVICE_TAG;
-    tfa_dev->amp_dev.common.module = (hw_module_t*)module;
-    tfa_dev->amp_dev.common.version = HARDWARE_DEVICE_API_VERSION(1, 0);
-    tfa_dev->amp_dev.common.close = amp_dev_close;
-
-    tfa_dev->amp_dev.set_feedback = amp_set_feedback;
-
-    if (hw_get_module_by_class(AUDIO_HARDWARE_MODULE_ID, AUDIO_HARDWARE_MODULE_ID_PRIMARY,
-                               &tfa_dev->module_ahal)) {
-        ALOGW("%s: Failed to load audio.primary", __func__);
-        return -ENODEV;
-    }
-
-#define LOAD_AHAL_SYMBOL(symbol)                                          \
-    do {                                                                  \
-        tfa_dev->symbol = dlsym(tfa_dev->module_ahal->dso, #symbol);      \
-        if (tfa_dev->symbol == NULL) {                                    \
-            ALOGW("%s: %s not found (%s)", __func__, #symbol, dlerror()); \
-            free(tfa_dev);                                                \
-            return -ENODEV;                                               \
-        }                                                                 \
-    } while (0)
-
-    LOAD_AHAL_SYMBOL(enable_snd_device);
-    LOAD_AHAL_SYMBOL(enable_audio_route);
-    LOAD_AHAL_SYMBOL(disable_snd_device);
-    LOAD_AHAL_SYMBOL(disable_audio_route);
-    LOAD_AHAL_SYMBOL(platform_get_pcm_device_id);
-    LOAD_AHAL_SYMBOL(get_usecase_from_list);
-
-#undef LOAD_AHAL_SYMBOL
-
-    *device = (hw_device_t*)tfa_dev;
-
-    return 0;
-}
-
-static struct hw_module_methods_t hal_module_methods = {
-        .open = amp_module_open,
-};
-
-/* clang-format off */
-amplifier_module_t HAL_MODULE_INFO_SYM = {
-    .common = {
-        .tag = HARDWARE_MODULE_TAG,
-        .module_api_version = AMPLIFIER_MODULE_API_VERSION_0_1,
-        .hal_api_version = HARDWARE_HAL_API_VERSION,
-        .id = AMPLIFIER_HARDWARE_MODULE_ID,
-        .name = "TFA98XX audio amplifier HAL",
-        .author = "The LineageOS Open Source Project",
-        .methods = &hal_module_methods,
-    },
-};
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,65 +1,30 @@
 # Audio
 aaudio.hw_burst_min_usec=2000
 aaudio.mmap_exclusive_policy=2
-aaudio.mmap_policy=2
-audio.deep_buffer.media=true
-audio.offload.min.duration.secs=30
-audio.offload.video=true
+aaudio.mmap_policy=1
 persist.vendor.audio.fluence.speaker=true
+persist.vendor.audio.fluence.tmic.enabled=false
 persist.vendor.audio.fluence.voicecall=true
 persist.vendor.audio.fluence.voicecomm=true
 persist.vendor.audio.fluence.voicerec=false
+persist.vendor.audio.hifi=false
 persist.vendor.audio.ras.enabled=false
+persist.vendor.audio.voicecall.speaker.stereo=true
+persist.vendor.audio_hal.dsp_bit_width_enforce_mode=24
 ro.config.vc_call_vol_steps=11
 ro.vendor.audio.sdk.fluencetype=fluence
-vendor.audio.adm.buffering.ms=6
-vendor.audio.feature.a2dp_offload.enable=true
-vendor.audio.feature.afe_proxy.enable=true
-vendor.audio.feature.anc_headset.enable=true
-vendor.audio.feature.battery_listener.enable=true
-vendor.audio.feature.compr_cap.enable=false
-vendor.audio.feature.compress_in.enable=false
-vendor.audio.feature.compress_meta_data.enable=true
-vendor.audio.feature.compr_voip.enable=false
-vendor.audio.feature.concurrent_capture.enable=false
-vendor.audio.feature.custom_stereo.enable=true
-vendor.audio.feature.deepbuffer_as_primary.enable=false
-vendor.audio.feature.display_port.enable=true
-vendor.audio.feature.dsm_feedback.enable=false
-vendor.audio.feature.dynamic_ecns.enable=false
-vendor.audio.feature.ext_hw_plugin.enable=false
-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.hdmi_edid.enable=true
-vendor.audio.feature.hdmi_passthrough.enable=false
-vendor.audio.feature.hfp.enable=true
-vendor.audio.feature.hifi_audio.enable=false
-vendor.audio.feature.hwdep_cal.enable=false
-vendor.audio.feature.incall_music.enable=true
-vendor.audio.feature.multi_voice_session.enable=true
-vendor.audio.feature.keep_alive.enable=true
-vendor.audio.feature.kpi_optimize.enable=false
-vendor.audio.feature.maxx_audio.enable=false
-vendor.audio.feature.ras.enable=true
-vendor.audio.feature.record_play_concurency.enable=false
-vendor.audio.feature.src_trkn.enable=true
-vendor.audio.feature.spkr_prot.enable=true
-vendor.audio.feature.ssrec.enable=false
-vendor.audio.feature.usb_offload.enable=true
-vendor.audio.feature.usb_offload_burst_mode.enable=true
-vendor.audio.feature.usb_offload_sidetone_volume.enable=false
-vendor.audio.feature.vbat.enable=true
-vendor.audio.feature.wsa.enable=false
-vendor.audio.feature.audiozoom.enable=false
-vendor.audio.feature.snd_mon.enable=true
-vendor.audio.hal.boot.timeout.ms=20000
+ro.vendor.audio.sdk.ssr=false
 vendor.audio_hal.in_period_size=144
 vendor.audio_hal.period_multiplier=3
 vendor.audio_hal.period_size=192
+vendor.audio.adm.buffering.ms=6
+vendor.audio.dolby.ds2.enabled=false
+vendor.audio.dolby.ds2.hardbypass=false
+vendor.audio.enable.mirrorlink=false
+vendor.audio.hal.boot.timeout.ms=20000
+vendor.audio.hal.output.suspend.supported=false
 vendor.audio.hw.aac.encoder=false
-vendor.audio.offload.buffer.size.kb=256
+vendor.audio.offload.buffer.size.kb=32
 vendor.audio.offload.gapless.enabled=true
 vendor.audio.offload.multiaac.enable=true
 vendor.audio.offload.multiple.enabled=false
@@ -67,7 +32,7 @@ vendor.audio.offload.passthrough=false
 vendor.audio.offload.track.enable=false
 vendor.audio.parser.ip.buffer.size=262144
 vendor.audio.safx.pbe.enabled=false
-vendor.audio.spkr_prot.tx.sampling_rate=48000
+vendor.audio.spkcal.copy.inhal=true
 vendor.audio.tunnel.encode=false
 vendor.audio.usb.disable.sidetone=true
 vendor.audio.use.sw.alac.decoder=true
@@ -168,8 +133,6 @@ ro.frp.pst=/dev/block/bootdevice/by-name/frp

 # FM
 vendor.hw.fm.init=0
-vendor.audio.feature.fm.enable=true
-ro.vendor.fm.use_audio_session=true

 # FS-verity
 ro.apk_verity.mode=2
@@ -208,8 +171,6 @@ ro.surface_flinger.max_frame_buffer_acquired_buffers=3
 ro.surface_flinger.max_virtual_display_dimension=4096
 ro.surface_flinger.use_color_management=true
 ro.surface_flinger.wcg_composition_dataspace=143261696
-ro.surface_flinger.support_kernel_idle_timer=true
-ro.surface_flinger.uclamp.min=307
 vendor.gralloc.disable_ubwc=0

 # IFAAService
@@ -220,10 +181,6 @@ ro.hardware.fp.udfps=true
 # Keystore
 ro.hardware.keystore_desede=true

-# Logging
-persist.log.tag.QC2Buf=W
-persist.log.tag.QC2V4l2Codec=E
-
 # Media
 debug.stagefright.c2inputsurface=-1
				`@@ -1 +0,0 @@`
				`#!./extract-files.py --regenerate_makefiles`