felix: Initialize for Evolution X 11.x

Signed-off-by: AnierinB <anierin@evolution-x.org>
felix: Drop prebuilt kernel dependency
2025-09-26 04:54:53 +00:00 · 2025-08-28 16:16:45 +03:00 · 2025-08-13 02:22:25 +00:00 · 2025-07-09 16:02:42 +03:00 · 2025-06-26 10:19:52 +03:00 · 2025-06-26 10:19:52 +03:00
136 changed files with 3636 additions and 275826 deletions
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,9 +16,4 @@

 PRODUCT_MAKEFILES := \
    $(LOCAL_DIR)/aosp_felix.mk \
-    $(LOCAL_DIR)/aosp_felix_hwasan.mk \
-    $(LOCAL_DIR)/factory_felix.mk \
    $(LOCAL_DIR)/lineage_felix.mk
-
-COMMON_LUNCH_CHOICES := \
-    aosp_felix-trunk_staging-userdebug
--- a/BoardConfigEvolution.mk
+++ b/BoardConfigEvolution.mk
@@ -0,0 +1,4 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -1,5 +1,11 @@
 #
-# Copyright (C) 2023 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #
+
+# Kernel modules
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_kernel_boot
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_kernel_boot))
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)))
--- a/4
+++ b/4
@@ -1,4 +0,0 @@
-per-file powerhint.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com
-
-# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,2 +0,0 @@
-[Builtin Hooks]
-jsonlint = true
--- a/aosp_felix.mk
+++ b/aosp_felix.mk
@@ -27,6 +27,3 @@ PRODUCT_DEVICE := felix
 PRODUCT_MODEL := AOSP on Felix
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
-
-DEVICE_MANIFEST_FILE := \
-	device/google/felix/manifest.xml
--- a/aosp_felix_hwasan.mk
+++ b/aosp_felix_hwasan.mk
@@ -1,23 +0,0 @@
-#
-# Copyright 2023 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-$(call inherit-product, device/google/felix/aosp_felix.mk)
-PRODUCT_NAME := aosp_felix_hwasan
-
-# Add "hwaddress" as a global sanitizer if it's missing.
-ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
-  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
-endif
--- a/audio/felix/aidl_config/mixer_paths_aidl.xml
+++ b/audio/felix/aidl_config/mixer_paths_aidl.xml
@@ -1344,7 +1344,7 @@
    <path name="bluetooth-sco-headset-microphones" />
  </path>

-  <path name="usb-headset-microphones">
+  <path name="usb-microphones">
    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -1354,6 +1354,15 @@
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

+  <path name="usb-headset-microphones">
+    <path name="usb-microphones" />
+  </path>
+
+  <path name="usb-device-microphones">
+    <path name="usb-microphones" />
+  </path>
+
+
  <!-- cs35l41 specific path to load firmware in cs35l41.c -->
  <path name="cs35l41-load-protection-firmware-start">
    <!-- Enable it after get the protection firmware -->
--- a/audio/felix/audio-tables.mk
+++ b/audio/felix/audio-tables.mk
@@ -64,27 +64,3 @@ PRODUCT_COPY_FILES += \
    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
-
-# eng specific
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.mods \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.mods
-
-#Bluenote files
-PRODUCT_COPY_FILES += \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/template.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/template.xml \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/tuning_constraints_combination.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/tuning_constraints_combination.xml
-
-# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
-PRODUCT_COPY_FILES += \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
-
-# Waves ini/mps files for unit tests of halcontroller
-PRODUCT_COPY_FILES += \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/test_config.ini \
-    device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
-
-endif
--- a/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -59,7 +59,7 @@
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                </mixPort>
                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                </mixPort>
                <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
--- a/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -59,7 +59,7 @@
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                </mixPort>
                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                </mixPort>
                <mixPort name="incall playback" role="source"
--- a/audio/felix/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/felix/config/audio_policy_configuration_le_offload_disabled.xml
@@ -60,7 +60,7 @@
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                </mixPort>
                <mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
+                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                </mixPort>
                <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
--- a/audio/felix/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/felix/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,6 +11,7 @@
                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
        </mixPort>
        <!-- Le Audio Audio Ports -->
+        <mixPort name="le audio broadcast output" role="source" />
        <mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                     samplingRates="44100 48000"
@@ -51,6 +52,7 @@
        <devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
        <devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
        <devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
+        <devicePort tagName="BLE Broadcast Out" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"/>
    </devicePorts>
    <routes>
        <route type="mix" sink="BT A2DP Out"
@@ -66,6 +68,8 @@
        <route type="mix" sink="le audio input"
               sources="BLE Headset In"/>
        <route type="mix" sink="BLE Speaker Out"
-               sources="le audio output"/>
+            sources="le audio output"/>
+        <route type="mix" sink="BLE Broadcast Out"
+            sources="le audio broadcast output"/>
    </routes>
 </module>
--- a/audio/felix/config/mixer_paths_factory.xml
+++ b/audio/felix/config/mixer_paths_factory.xml
@@ -1,384 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<mixer>
-    <ctl name="TDM_0_RX Mixer EP3" value="0" />
-    <ctl name="TDM_0_RX Mixer EP6" value="0" />
-    <ctl name="I2S_0_RX Mixer EP3" value="0" />
-    <ctl name="Main AMP Enable Switch" value="0" />
-    <ctl name="R Main AMP Enable Switch" value="0" />
-    <ctl name="E Main AMP Enable Switch" value="0" />
-    <ctl name="MIC HW Gain At Lower Power Mode (cB)" value="-160" />
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-
-    <ctl name="EP1 TX Mixer TDM_0_TX" value="0" />
-    <ctl name="DEFAULT_MIC_ID" value="0" />
-    <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
-
-    <path name="mfg-playback">
-    </path>
-
-    <path name="deep-buffer-playback speaker">
-        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
-        <ctl name="TDM_0_RX Mixer EP6" value="1" />
-        <path name="mfg-playback" />
-    </path>
-
-    <path name="deep-buffer-playback headphones">
-        <ctl name="I2S_0_RX Mixer EP6" value="1" />
-        <path name="mfg-playback" />
-    </path>
-
-    <path name="mfg-record">
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="mfg-record usb-headset-mic">
-        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
-        <ctl name="USB Playback EP ID v2" value="0" />
-        <ctl name="USB Capture FORMAT v2" value="1" />
-        <ctl name="USB Config To AoC v2" value="1"/>
-        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic1-status">
-    </path>
-
-    <path name="mic2-status">
-    </path>
-
-    <path name="mic3-status">
-    </path>
-
-    <path name="mic4-status">
-    </path>
-
-    <path name="mic1-gain">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" />
-    </path>
-
-    <path name="mic2-gain">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" />
-    </path>
-
-    <path name="mic3-gain">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" />
-    </path>
-
-    <path name="mic4-gain">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" />
-    </path>
-
-    <path name="mic1-sw-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="mic2-sw-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="mic3-sw-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="mic4-sw-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="usb-capture-gain">
-        <ctl name="MIC Record Soft Gain (dB)" />
-    </path>
-
-    <path name="mic1-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic2-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="3" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic3-only">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="2" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="mic-all">
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="amp_iv-only">
-        <ctl name="E ASPTX1 Slot Position" value="3" />
-        <ctl name="E ASPTX2 Slot Position" value="5" />
-        <ctl name="E ASPTX3 Slot Position" value="6" />
-        <ctl name="E ASPTX4 Slot Position" value="7" />
-        <ctl name="R ASPTX1 Slot Position" value="2" />
-        <ctl name="R ASPTX2 Slot Position" value="0" />
-        <ctl name="R ASPTX3 Slot Position" value="6" />
-        <ctl name="R ASPTX4 Slot Position" value="7" />
-        <ctl name="ASPTX1 Slot Position" value="1" />
-        <ctl name="ASPTX2 Slot Position" value="4" />
-        <ctl name="ASPTX3 Slot Position" value="5" />
-        <ctl name="ASPTX4 Slot Position" value="6" />
-        <ctl name="E ASP TX1 Source" value="VMON" />
-        <ctl name="E ASP TX2 Source" value="Zero" />
-        <ctl name="E ASP TX3 Source" value="Zero" />
-        <ctl name="E ASP TX4 Source" value="Zero" />
-        <ctl name="R ASP TX1 Source" value="VMON" />
-        <ctl name="R ASP TX2 Source" value="ASPRX1" />
-        <ctl name="R ASP TX3 Source" value="Zero" />
-        <ctl name="R ASP TX4 Source" value="Zero" />
-        <ctl name="ASP TX1 Source" value="VMON" />
-        <ctl name="ASP TX2 Source" value="Zero" />
-        <ctl name="ASP TX3 Source" value="Zero" />
-        <ctl name="ASP TX4 Source" value="Zero" />
-        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="amp_iv1-only">
-        <ctl name="E ASPTX1 Slot Position" value="4" />
-        <ctl name="E ASPTX2 Slot Position" value="5" />
-        <ctl name="E ASPTX3 Slot Position" value="6" />
-        <ctl name="E ASPTX4 Slot Position" value="7" />
-        <ctl name="R ASPTX1 Slot Position" value="4" />
-        <ctl name="R ASPTX2 Slot Position" value="5" />
-        <ctl name="R ASPTX3 Slot Position" value="6" />
-        <ctl name="R ASPTX4 Slot Position" value="7" />
-        <ctl name="ASPTX1 Slot Position" value="0" />
-        <ctl name="ASPTX2 Slot Position" value="1" />
-        <ctl name="ASPTX3 Slot Position" value="2" />
-        <ctl name="ASPTX4 Slot Position" value="3" />
-        <ctl name="E ASP TX1 Source" value="Zero" />
-        <ctl name="E ASP TX2 Source" value="Zero" />
-        <ctl name="E ASP TX3 Source" value="Zero" />
-        <ctl name="E ASP TX4 Source" value="Zero" />
-        <ctl name="R ASP TX1 Source" value="Zero" />
-        <ctl name="R ASP TX2 Source" value="Zero" />
-        <ctl name="R ASP TX3 Source" value="Zero" />
-        <ctl name="R ASP TX4 Source" value="Zero" />
-        <ctl name="ASP TX1 Source" value="VMON" />
-        <ctl name="ASP TX2 Source" value="IMON" />
-        <ctl name="ASP TX3 Source" value="VPMON" />
-        <ctl name="ASP TX4 Source" value="ASPRX1" />
-        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="amp_iv2-only">
-        <ctl name="E ASPTX1 Slot Position" value="4" />
-        <ctl name="E ASPTX2 Slot Position" value="5" />
-        <ctl name="E ASPTX3 Slot Position" value="6" />
-        <ctl name="E ASPTX4 Slot Position" value="7" />
-        <ctl name="R ASPTX1 Slot Position" value="0" />
-        <ctl name="R ASPTX2 Slot Position" value="1" />
-        <ctl name="R ASPTX3 Slot Position" value="2" />
-        <ctl name="R ASPTX4 Slot Position" value="3" />
-        <ctl name="ASPTX1 Slot Position" value="4" />
-        <ctl name="ASPTX2 Slot Position" value="5" />
-        <ctl name="ASPTX3 Slot Position" value="6" />
-        <ctl name="ASPTX4 Slot Position" value="7" />
-        <ctl name="E ASP TX1 Source" value="Zero" />
-        <ctl name="E ASP TX2 Source" value="Zero" />
-        <ctl name="E ASP TX3 Source" value="Zero" />
-        <ctl name="E ASP TX4 Source" value="Zero" />
-        <ctl name="R ASP TX1 Source" value="VMON" />
-        <ctl name="R ASP TX2 Source" value="IMON" />
-        <ctl name="R ASP TX3 Source" value="VPMON" />
-        <ctl name="R ASP TX4 Source" value="ASPRX1" />
-        <ctl name="ASP TX1 Source" value="Zero" />
-        <ctl name="ASP TX2 Source" value="Zero" />
-        <ctl name="ASP TX3 Source" value="Zero" />
-        <ctl name="ASP TX4 Source" value="Zero" />
-        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="amp_iv3-only">
-        <ctl name="E ASPTX1 Slot Position" value="0" />
-        <ctl name="E ASPTX2 Slot Position" value="1" />
-        <ctl name="E ASPTX3 Slot Position" value="2" />
-        <ctl name="E ASPTX4 Slot Position" value="3" />
-        <ctl name="R ASPTX1 Slot Position" value="4" />
-        <ctl name="R ASPTX2 Slot Position" value="5" />
-        <ctl name="R ASPTX3 Slot Position" value="6" />
-        <ctl name="R ASPTX4 Slot Position" value="7" />
-        <ctl name="ASPTX1 Slot Position" value="4" />
-        <ctl name="ASPTX2 Slot Position" value="5" />
-        <ctl name="ASPTX3 Slot Position" value="6" />
-        <ctl name="ASPTX4 Slot Position" value="7" />
-        <ctl name="E ASP TX1 Source" value="VMON" />
-        <ctl name="E ASP TX2 Source" value="IMON" />
-        <ctl name="E ASP TX3 Source" value="VPMON" />
-        <ctl name="E ASP TX4 Source" value="ASPRX1" />
-        <ctl name="R ASP TX1 Source" value="Zero" />
-        <ctl name="R ASP TX2 Source" value="Zero" />
-        <ctl name="R ASP TX3 Source" value="Zero" />
-        <ctl name="R ASP TX4 Source" value="Zero" />
-        <ctl name="ASP TX1 Source" value="Zero" />
-        <ctl name="ASP TX2 Source" value="Zero" />
-        <ctl name="ASP TX3 Source" value="Zero" />
-        <ctl name="ASP TX4 Source" value="Zero" />
-        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="speaker1-status">
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="speaker2-status">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="speaker3-status">
-        <ctl name="E Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="speaker1-gain">
-        <ctl name="AMP PCM Gain" />
-    </path>
-
-    <path name="speaker2-gain">
-        <ctl name="R AMP PCM Gain" />
-    </path>
-
-    <path name="speaker3-gain">
-        <ctl name="E AMP PCM Gain" />
-    </path>
-
-    <path name="usb-playback-gain">
-        <ctl name="Headset Playback Volume" />
-    </path>
-
-    <path name="mfg-playback speaker">
-        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
-        <ctl name="TDM_0_RX Mixer EP3" value="1" />
-        <ctl name="ASPRX1 Slot Position" value="0" />
-        <ctl name="R ASPRX1 Slot Position" value="1" />
-        <ctl name="SINK_IDS" id="0" value="0" />
-        <ctl name="SINK_IDS" id="1" value="-1" />
-    </path>
-
-    <path name="mfg-playback headphones">
-        <ctl name="I2S_0_RX Chan" value="Two" />
-        <ctl name="I2S_0_RX Format" value="S32_LE" />
-        <ctl name="I2S_0_RX Mixer EP3" value="1" />
-        <ctl name="SINK_IDS" id="0" value="1" />
-        <ctl name="SINK_IDS" id="1" value="-1" />
-    </path>
-
-    <path name="mfg-playback usb-headphones">
-        <ctl name="USB Dev ID v2" value="2" />
-        <ctl name="USB Capture EP ID v2" value="0" />
-        <ctl name="USB Playback EP ID v2" value="1" />
-        <ctl name="USB Playback FORMAT v2" value="6" />
-        <ctl name="USB Playback SR v2" value="48000" />
-        <ctl name="USB Playback CH v2" value="2" />
-        <ctl name="USB Playback BW v2" value="16" />
-        <ctl name="USB Config To AoC v2" value="1" />
-        <ctl name="USB_RX Mixer EP3" value="1" />
-    </path>
-
-    <path name="speaker1-only">
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <path name="mfg-playback speaker" />
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="PCM Source" value="ASP" />
-    </path>
-
-    <path name="speaker2-only">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-        <path name="mfg-playback speaker" />
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R PCM Source" value="ASP" />
-    </path>
-
-    <path name="speaker3-only">
-        <ctl name="E Main AMP Enable Switch" value="1" />
-        <path name="mfg-playback speaker" />
-        <ctl name="E PCM Source" value="ASP" />
-    </path>
-
-    <path name="headphones">
-        <ctl name="DAC1 MIXL DAC1 Switch" value="1" />
-        <ctl name="DAC1 MIXR DAC1 Switch" value="1" />
-        <ctl name="Stereo1 DAC MIXL DAC L1 Switch" value="1" />
-        <ctl name="Stereo1 DAC MIXR DAC R1 Switch" value="1" />
-        <ctl name="DAC L1 Source" value="Stereo1 DAC Mixer" />
-        <ctl name="DAC R1 Source" value="Stereo1 DAC Mixer" />
-        <ctl name="HPOL Playback Switch" value="1" />
-        <ctl name="HPOR Playback Switch" value="1" />
-        <path name="mfg-playback headphones" />
-    </path>
-
-    <path name="speaker-all">
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <ctl name="PCM Source" value="ASP" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-        <ctl name="R PCM Source" value="ASP" />
-        <ctl name="E Main AMP Enable Switch" value="1" />
-        <ctl name="E PCM Source" value="ASP" />
-        <path name="mfg-playback speaker" />
-    </path>
-
-    <path name="loopback-mic-speaker">
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-        <ctl name="SINK_IDS" id="0" value="0" />
-        <ctl name="SINK_IDS" id="1" value="-1" />
-        <path name="mfg-playback" />
-    </path>
-
-    <path name="loopback-mic-headphones">
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-        <ctl name="SINK_IDS" id="0" value="1" />
-        <ctl name="SINK_IDS" id="1" value="-1" />
-        <path name="mfg-playback" />
-    </path>
-
-    <path name="loopback-mic-usb-headphones">
-        <ctl name="MIC HW Gain At Lower Power Mode (cB)" value="-160" />
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
-        <ctl name="TDM_0_TX Format" value="S32_LE" />
-        <ctl name="TDM_0_TX Chan" value="One" />
-        <ctl name="EP1 TX Mixer TDM_0_TX" value="1" />
-    </path>
-
-    <path name="loopback-usb-mic-speaker">
-        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
-        <ctl name="USB Capture FORMAT v2" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="loopback-usb-mic-usb-headphone">
-        <ctl name="Audio Capture Mic Source" value="USB_MIC" />
-        <ctl name="USB Capture FORMAT v2" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <pcm_id name="loopback-mic1" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-mic2" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-mic3" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-mic4" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-speaker1" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-speaker2" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-speaker3" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-headphones" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-usb-headphones" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-usb-mic" value="EP1 capture (*)"/>
-    <pcm_id name="loopback-amp_iv" value="nohost1 capture (*)"/>
-</mixer>
--- a/audio/felix/cs35l41/crus_sp_cal_mixer_paths.xml
+++ b/audio/felix/cs35l41/crus_sp_cal_mixer_paths.xml
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.    -->
-<!--                                                                        -->
-<!-- Redistribution and use in source and binary forms, with or without     -->
-<!-- modification, are permitted provided that the following conditions are -->
-<!-- met:                                                                   -->
-<!--     * 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>
-    <!-- Initial Values -->
-    <!-- Preload Stage -->
-    <ctl name="Main AMP Enable Switch" value="0" />
-    <ctl name="DSP1 Preload Switch" value="0" />
-    <ctl name="R Main AMP Enable Switch" value="0" />
-    <ctl name="R DSP1 Preload Switch" value="0" />
-    <!-- Clock-trigger Stage -->
-    <ctl name="SINK_IDS" id="0" value="-1"/>
-    <ctl name="SINK_IDS" id="1" value="-1"/>
-    <ctl name="PCM Playback Volume" value="10"/>
-    <ctl name="TDM_0_RX Mixer EP6" value="0"/>
-
-    <!-- Preparation Stage -->
-    <path name="crus-switch-fw-prepare">
-        <ctl name="DRE DRE Switch" value="1" />
-        <ctl name="VBSTMON Output Switch" value="1" />
-        <ctl name="DSP Booted" value="0" />
-        <ctl name="DSP1 Preload Switch" value="0" />
-        <ctl name="R DRE DRE Switch" value="1" />
-        <ctl name="R VBSTMON Output Switch" value="1" />
-        <ctl name="R DSP Booted" value="0" />
-        <ctl name="R DSP1 Preload Switch" value="0" />
-    </path>
-
-    <!-- Preload Stage -->
-    <path name="crus-fw-preload">
-        <ctl name="DSP1 Preload Switch" value="1" />
-        <ctl name="R DSP1 Preload Switch" value="1" />
-    </path>
-
-    <!-- Firmware-switching Stage -->
-    <path name="crus-switch-fw-Calibration">
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="Digital PCM Volume" value="817" />
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Calibration" />
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R Digital PCM Volume" value="817" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Calibration" />
-    </path>
-
-    <path name="crus-switch-fw-Diagnostic">
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="Digital PCM Volume" value="817" />
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Diagnostic" />
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R Digital PCM Volume" value="817" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Diagnostic" />
-    </path>
-
-    <path name="crus-switch-fw-Protection">
-        <ctl name="PCM Source" value="DSP" />
-        <ctl name="DSP1 Firmware" value="Protection" />
-        <ctl name="R PCM Source" value="DSP" />
-        <ctl name="R DSP1 Firmware" value="Protection" />
-    </path>
-
-    <!-- DSP-initialization Stage -->
-    <path name="crus-dsp-pre-calibration-amp1">
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-calibration-amp2">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-calibration">
-        <path name="crus-dsp-pre-calibration-amp1" />
-        <path name="crus-dsp-pre-calibration-amp2" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic-amp1">
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic-amp2">
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="crus-dsp-pre-diagnostic">
-        <path name="crus-dsp-pre-diagnostic-amp1" />
-        <path name="crus-dsp-pre-diagnostic-amp2" />
-    </path>
-
-    <path name="crus-dsp-pre-protection">
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <!-- Clock-trigger Stage -->
-    <path name="platform-controls">
-        <ctl name="PCM Playback Volume" value="1000"/>
-        <ctl name="SINK_IDS" id="0" value="0"/>
-        <ctl name="SINK_IDS" id="1" value="-1"/>
-        <ctl name="TDM_0_RX Mixer EP6" value="1"/>
-    </path>
-
-    <!-- Post loaded firmware -->
-    <path name="crus-dsp-post-loading-fw">
-        <ctl name="Main AMP Enable Switch" value="0" />
-        <ctl name="R Main AMP Enable Switch" value="0" />
-    </path>
-
-    <!-- Value & Information Fetch Stage -->
-    <path name="platform-values">
-        <ctl name="TDM_0_RX Format" />
-        <ctl name="TDM_0_RX Chan" />
-        <ctl name="TDM_0_RX Sample Rate" />
-        <ctl name="PCM Playback Volume" />
-        <ctl name="TDM_0_RX Mixer EP6" />
-    </path>
-
-    <path name="cs35l41-values">
-        <ctl name="DRE DRE Switch" />
-        <ctl name="R DRE DRE Switch" />
-        <ctl name="VBSTMON Output Switch" />
-        <ctl name="R VBSTMON Output Switch" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        <ctl name="R Digital PCM Volume" />
-        <ctl name="PCM Source" />
-        <ctl name="R PCM Source" />
-        <ctl name="DSP Booted" />
-        <ctl name="R DSP Booted" />
-        <ctl name="Main AMP Enable Switch" />
-        <ctl name="R Main AMP Enable Switch" />
-        <ctl name="DSP1 Preload Switch" />
-        <ctl name="R DSP1 Preload Switch" />
-        <ctl name="DSP1 Firmware" />
-        <ctl name="R DSP1 Firmware" />
-    </path>
-
-
-    <!-- Note that the order of controls does matter because
-         it should be matched to the structure defined in
-         sp_cal_common.h -->
-    <!--
-        struct calibration_data {
-            unsigned int cal_r;
-            unsigned int cal_status;
-            unsigned int cal_checksum;
-            unsigned int cal_ambient;
-            unsigned int amp_pcm_gain;
-            unsigned int digital_pcm_gain;
-        };
-    -->
-    <path name="cs35l41-dsp-amp1-calibration-values">
-        <ctl name="DSP1 Calibration cd CAL_R" />
-        <ctl name="DSP1 Calibration cd CAL_STATUS" />
-        <ctl name="DSP1 Calibration cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Calibration cd CAL_AMBIENT" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-
-        <!-- Only for debug print -->
-        <ctl name="DSP1 Calibration cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-calibration-values">
-        <ctl name="R DSP1 Calibration cd CAL_R" />
-        <ctl name="R DSP1 Calibration cd CAL_STATUS" />
-        <ctl name="R DSP1 Calibration cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Calibration cd CAL_AMBIENT" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-
-        <!-- Only for debug print -->
-        <ctl name="R DSP1 Calibration cd CAL_SET_STATUS" />
-    </path>
-
-    <!--
-        struct diagnostic_data {
-            struct calibration_data calibration_data;
-            unsigned int z_low_diff;
-            unsigned int diag_f0;
-            unsigned int diag_f0_status;
-        };
-    -->
-    <path name="cs35l41-dsp-amp1-diagnostic-values">
-        <!-- struct calibration_data START -->
-        <ctl name="DSP1 Diagnostic cd CAL_R" />
-        <ctl name="DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="DSP1 Diagnostic cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Diagnostic cd CAL_AMBIENT" />
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        <!-- struct calibration_data END -->
-        <ctl name="DSP1 Diagnostic cd DIAG_Z_LOW_DIFF" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0_STATUS" />
-
-        <!-- Only for debug print -->
-        <ctl name="DSP1 Diagnostic cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-diagnostic-values">
-        <!-- struct calibration_data START -->
-        <ctl name="R DSP1 Diagnostic cd CAL_R" />
-        <ctl name="R DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="R DSP1 Diagnostic cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Diagnostic cd CAL_AMBIENT" />
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-        <!-- struct calibration_data END -->
-        <ctl name="R DSP1 Diagnostic cd DIAG_Z_LOW_DIFF" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0_STATUS" />
-
-        <!-- Only for debug print -->
-        <ctl name="R DSP1 Diagnostic cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-protection-values">
-        <!-- struct calibration_data START -->
-        <ctl name="DSP1 Protection cd CAL_R" />
-        <ctl name="DSP1 Protection cd CAL_STATUS" />
-        <ctl name="DSP1 Protection cd CAL_CHECKSUM" />
-        <ctl name="DSP1 Protection cd CAL_AMBIENT" />
-
-        <!-- These controls are unrelated so we can simply
-             skip them
-        <ctl name="AMP PCM Gain" />
-        <ctl name="Digital PCM Volume" />
-        -->
-        <!-- struct calibration_data END -->
-    </path>
-
-    <path name="cs35l41-dsp-amp2-protection-values">
-        <!-- struct calibration_data START -->
-        <ctl name="R DSP1 Protection cd CAL_R" />
-        <ctl name="R DSP1 Protection cd CAL_STATUS" />
-        <ctl name="R DSP1 Protection cd CAL_CHECKSUM" />
-        <ctl name="R DSP1 Protection cd CAL_AMBIENT" />
-
-        <!-- These controls are unrelated so we can simply
-             skip them
-        <ctl name="R AMP PCM Gain" />
-        <ctl name="R Digital PCM Volume" />
-        -->
-        <!-- struct calibration_data END -->
-    </path>
-
-    <path name="cs35l41-dsp-amp1-calibration-completion">
-        <ctl name="DSP1 Calibration cd CAL_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-calibration-completion">
-        <ctl name="R DSP1 Calibration cd CAL_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-protection-completion">
-        <ctl name="DSP1 Protection cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-protection-completion">
-        <ctl name="R DSP1 Protection cd CAL_SET_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-diagnostic-completion">
-        <ctl name="DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="DSP1 Diagnostic cd DIAG_F0_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-diagnostic-completion">
-        <ctl name="R DSP1 Diagnostic cd CAL_STATUS" />
-        <ctl name="R DSP1 Diagnostic cd DIAG_F0_STATUS" />
-    </path>
-
-    <path name="cs35l41-dsp-amp1-enable-status">
-        <ctl name="Main AMP Enable Switch" />
-    </path>
-
-    <path name="cs35l41-dsp-amp2-enable-status">
-        <ctl name="R Main AMP Enable Switch" />
-    </path>
-</mixer>
--- a/audio/felix/factory-audio-tables.mk
+++ b/audio/felix/factory-audio-tables.mk
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2020 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-AUDIO_FACTORY_TABLE_FOLDER := felix
-
-# Mixer Path Configuration for Audio Factory
-PRODUCT_COPY_FILES += \
-    device/google/felix/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml
-
--- a/audio/felix/tuning/bluenote/template.xml
+++ b/audio/felix/tuning/bluenote/template.xml
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<template>
-  <modules>
-    <module id="2" name="Waves">
-      <param id="0" max="3" name="opMode_" type="uint32"/>
-    </module>
-    <module id="3" name="Forte">
-      <param id="0" max="3" name="opMode_" type="uint32"/>
-    </module>
-    <module id="5" name="Auto Gain Control">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="1" id="2" name="numCh_" type="uint32"/>
-      <param default="1" id="3" name="chMask_" type="uint32"/>
-      <param id="16" name="GainApplied" type="float"/>
-      <param id="17" name="idealRMS" type="float"/>
-      <param id="18" name="noiseGate" type="float"/>
-      <param id="19" name="minGain" type="float"/>
-      <param id="20" name="maxGain" type="float"/>
-      <param id="21" name="longGainAtRt" type="uint32"/>
-      <param id="22" name="GainAtRt" type="uint32"/>
-      <param id="23" name="rmsTav" type="uint32"/>
-    </module>
-    <module id="6" name="Surround Record">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="3" id="2" name="numCh_" type="uint32"/>
-      <param default="7" id="3" name="chMask_" type="uint32"/>
-      <param id="16" max="1" min="0" name="alpha" type="float"/>
-      <param complex="true" id="17" name="ch0_profileL" size="1024" type="float"/>
-      <param complex="true" id="18" name="ch1_profileL" size="1024" type="float"/>
-      <param complex="true" id="19" name="ch2_profileL" size="1024" type="float"/>
-      <param complex="true" id="20" name="ch0_profileR" size="1024" type="float"/>
-      <param complex="true" id="21" name="ch1_profileR" size="1024" type="float"/>
-      <param complex="true" id="22" name="ch2_profileR" size="1024" type="float"/>
-      <param complex="true" id="23" name="ch0_profileAZ" size="1024" type="float"/>
-      <param complex="true" id="24" name="ch1_profileAZ" size="1024" type="float"/>
-      <param complex="true" id="25" name="ch2_profileAZ" size="1024" type="float"/>
-      <struct id="26">
-        <param default="1" name="ch_gain" type="float"/>
-        <param default="1" name="zoom_gain" type="float"/>
-      </struct>
-      <param default="0" id="27" name="ch0_assignFrom" type="int32"/>
-      <param default="1" id="28" name="ch1_assignFrom" type="int32"/>
-      <param default="2" id="29" name="ch2_assignFrom" type="int32"/>
-      <param default="0.33" id="30" name="alpha_enhancedRate" type="float"/>
-      <param default="0" id="31" name="swapOutputLR" type="int32"/>
-      <struct id="32">
-        <param default="1.0" name="CB_alpha_lowband" type="float"/>
-        <param default="1.0" name="CB_alpha_midband" type="float"/>
-        <param default="1.0" name="CB_alpha_highband" type="float"/>
-      </struct>
-      <struct id="33">
-        <param default="1.0" name="CB_epsilon_lowband" type="float"/>
-        <param default="1.0" name="CB_epsilon_midband" type="float"/>
-        <param default="1.0" name="CB_epsilon_highband" type="float"/>
-      </struct>
-      <struct id="34">
-        <param default="13" name="CB_fc_low_mid" type="int32"/>
-        <param default="22" name="CB_fc_mid_high" type="int32"/>
-        <param default="5" name="CB_smooth_span" type="int32"/>
-        <param default="1.0" name="CB_forget_factor" type="float"/>
-      </struct>
-    </module>
-    <module id="7" name="Multi Channel IIR 2">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="3" id="2" name="numCh_" type="uint32"/>
-      <param default="1" id="3" name="chMask_" type="uint32"/>
-      <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
-      <param id="17" name="coeff" size="300" type="float"/>
-      <struct id="18">
-        <param max="18" min="-96" name="gain" size="60" type="float"/>
-        <param max="24000" min="0" name="frequency" size="60" type="uint32"/>
-        <param max="200" min="0" name="qfactor" size="60" type="float"/>
-        <param default="4" name="type" size="60" type="int32"/>
-      </struct>
-    </module>
-    <module id="8" name="Multi Band DRC">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <struct id="16">
-        <param default="1" max="3" min="1" name="numBand" type="uint32"/>
-        <param name="IIR_LowPass1" size="5" type="float"/>
-        <param name="IIR_HighPass1" size="5" type="float"/>
-        <param name="IIR_LowPass2" size="5" type="float"/>
-        <param name="IIR_HighPass2" size="5" type="float"/>
-      </struct>
-      <struct id="17">
-        <param max="20" min="0" name="band0_delay_ms" type="float"/>
-        <param default="5" max="20" min="0" minInclusive="false" name="band0_rms_ms" type="float"/>
-        <param max="30" min="0" name="band0_gain_dB" type="float"/>
-        <param max="30" min="-30" name="band0_Min_Gain_dB" type="float"/>
-        <param default="1" max="3" min="1" name="band0_numOfKnee" type="uint32"/>
-        <param name="band0_threadhold_dB" size="3" type="float"/>
-        <param name="band0_compressRatio" size="4" type="float"/>
-        <param name="band0_kneeWidth" size="3" type="float"/>
-        <param name="band0_attackTime_ms" size="4" type="float"/>
-        <param name="band0_releaseTime_ms" size="4" type="float"/>
-        <param name="band0_hysteresis" size="4" type="float"/>
-        <param max="20" min="0" name="band1_delay_ms" type="float"/>
-        <param default="5" max="20" min="0" minInclusive="false" name="band1_rms_ms" type="float"/>
-        <param max="30" min="0" name="band1_gain_dB" type="float"/>
-        <param max="30" min="-30" name="band1_Min_Gain_dB" type="float"/>
-        <param default="1" max="3" min="1" name="band1_numOfKnee" type="uint32"/>
-        <param name="band1_threadhold_dB" size="3" type="float"/>
-        <param name="band1_compressRatio" size="4" type="float"/>
-        <param name="band1_kneeWidth" size="3" type="float"/>
-        <param name="band1_attackTime_ms" size="4" type="float"/>
-        <param name="band1_releaseTime_ms" size="4" type="float"/>
-        <param name="band1_hysteresis" size="4" type="float"/>
-        <param max="20" min="0" name="band2_delay_ms" type="float"/>
-        <param default="5" max="20" min="0" minInclusive="false" name="band2_rms_ms" type="float"/>
-        <param max="30" min="0" name="band2_gain_dB" type="float"/>
-        <param max="30" min="-30" name="band2_Min_Gain_dB" type="float"/>
-        <param default="1" max="3" min="1" name="band2_numOfKnee" type="uint32"/>
-        <param name="band2_threadhold_dB" size="3" type="float"/>
-        <param name="band2_compressRatio" size="4" type="float"/>
-        <param name="band2_kneeWidth" size="3" type="float"/>
-        <param name="band2_attackTime_ms" size="4" type="float"/>
-        <param name="band2_releaseTime_ms" size="4" type="float"/>
-        <param name="band2_hysteresis" size="4" type="float"/>
-      </struct>
-      <struct id="18">
-        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
-        <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
-        <param max="100" min="0" name="limiter_attackTime_ms" type="float"/>
-        <param max="100" min="0" name="limiter_releaseTime_ms" type="float"/>
-      </struct>
-      <struct id="19">
-        <param name="frequency0" type="uint32"/>
-        <param name="frequency1" type="uint32"/>
-      </struct>
-    </module>
-    <module id="11" name="Stationary Noise Suppression">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param default="1" id="16" name="strength level" type="uint32"/>
-      <param id="17" name="POWER_TIME_SMOOTH" type="float"/>
-      <param id="18" name="RMS_TIME_SMOOTH" type="float"/>
-      <param id="19" name="LOWER_BAND_THRESHOLD" size="129" type="float"/>
-      <param id="20" name="UPPER_BAND_THRESHOLD" size="3" type="float"/>
-      <param id="21" name="ATTACK_TIME" type="float"/>
-      <param id="22" name="RELEASE_TIME" type="float"/>
-    </module>
-    <module id="14" name="Linear Gain">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="1" id="2" name="numCh_" type="uint32"/>
-      <param default="1" id="3" name="chMask_" type="uint32"/>
-      <param id="16" name="Simple_gain" type="float"/>
-      <param default="0" id="17" name="ch0_assignFrom" type="int32"/>
-      <param default="1" id="18" name="ch1_assignFrom" type="int32"/>
-      <param default="2" id="19" name="ch2_assignFrom" type="int32"/>
-    </module>
-    <module id="17" name="Wind Noise Reduction">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param default="450" id="16" name="DECISION_SMOOTHING_FACTOR" type="int32"/>
-      <param default="50" id="17" name="DECISION_ATTACK_SMOOTHING_FACTOR" type="int32"/>
-      <param default="50" id="18" name="DECISION_RELEASE_HIGH_SMOOTHING_FACTOR" type="int32"/>
-      <param default="50" id="19" name="DECISION_RELEASE_LOW_SMOOTHING_FACTOR" type="int32"/>
-      <param default="700" id="20" name="DECISION_RELEASE_THRESHOLD" type="int32"/>
-      <param default="0" id="21" name="DECISION_RANGE_OFFSET_FACTOR" type="int32"/>
-      <param default="1000" id="22" name="DECISION_RANGE_SLOPE_FACTOR" type="int32"/>
-      <param default="450" id="23" name="DECISION_GAIN_SMOOTHING_FACTOR" type="int32"/>
-      <param default="27" id="24" name="DECISION_DB_RANGE" type="int32"/>
-      <param default="1000" id="25" name="MASTER_REDUCTION_FACTOR" type="int32"/>
-      <param default="15" id="26" name="KEEP_NUM_OF_PREV_DECISIONS" type="int32"/>
-      <param default="1000" id="27" name="DEC_PRE_GAIN" type="int32"/>
-      <param default="16000" id="28" name="SUP_PRE_GAIN" type="int32"/>
-      <param default="2" id="29" name="COHERENCE_ENABLE" type="int32"/>
-      <param default="1" id="30" name="COHERENCE_START_BIN" type="int32"/>
-      <param default="10" id="31" name="COHERENCE_END_BIN" type="int32"/>
-      <param default="300" id="32" name="COHERENCE_THRESHOLD" type="int32"/>
-      <param default="990" id="33" name="COHERENCE_FORGETTING_FACTOR" type="int32"/>
-      <param default="0" id="34" name="DB_SCALING_FACTOR" type="int32"/>
-      <param default="9" id="35" name="SEP_LAYER" type="int32"/>
-      <param default="1" id="36" name="SP_GAIN_ENABLE" type="int32"/>
-      <param default="15" id="37" name="SP_GAIN_MAX_BIN" type="int32"/>
-      <param default="500" id="38" name="SP_GAIN_MIN" type="int32"/>
-      <param default="200" id="39" name="SP_GAIN_TH_MIN" type="int32"/>
-      <param default="450" id="40" name="SP_GAIN_TH_MAX" type="int32"/>
-      <param default="800" id="41" name="SP_GAIN_SMOOTH" type="int32"/>
-      <param default="3" id="42" name="SP_GAIN_FREQ_SMOOTH" type="int32"/>
-      <param default="300" id="43" name="MASTER_MAX_SUP_SMOOTHING_FACTOR" type="int32"/>
-      <param default="1" id="44" name="GAIN_FREQ_SMOOTH" type="int32"/>
-      <param default="2" id="45" name="GMIN_CURVE_TYPE" type="int32"/>
-      <param default="55" id="46" name="GMIN_LINEAR_SPLIT_MID_POINT_BINR" type="int32"/>
-      <param default="330" id="47" name="GMIN_LINEAR_SPLIT_MID_POINT_VAL" type="int32"/>
-      <param default="1000" id="48" name="SP_OVERSUB_RATIO" type="int32"/>
-      <param default="16" id="49" name="WIND_ENERGY_EST_COMPENSATION_GAIN" type="int32"/>
-      <param default="2000" id="50" name="WIND_ENERGY_CURVE_SLOPE" type="int32"/>
-      <param default="300" id="51" name="WIND_ENERGY_CURVE_OFFSET" type="int32"/>
-      <param default="16000" id="52" name="WIND_ENERGY_CURVE_MIN" type="int32"/>
-      <param default="16000" id="53" name="WIND_ENERGY_CURVE_MAX" type="int32"/>
-      <param default="900" id="54" name="WIND_ENERGY_SMOOTHING" type="int32"/>
-      <param default="144" id="55" name="WIND_ENERGY_NORM_DENOM" type="int32"/>
-      <param default="600" id="56" name="WIND_ENERGY_CURVE_SCALED_TH_MIN" type="int32"/>
-      <param default="900" id="57" name="WIND_ENERGY_CURVE_SCALED_TH_MAX" type="int32"/>
-      <param default="1" id="58" name="ENABLE_ML_COMBI_WIND_ENERGY" type="int32"/>
-      <param default="1" id="59" name="ENABLE_SP_COMBI_WIND_ENERGY" type="int32"/>
-      <param default="1" id="60" name="ENALBE_SP_COMBI_OVERSUBTRACTION" type="int32"/>
-      <param default="1" id="61" name="ENABLE_PRIORI_SNR" type="int32"/>
-      <param default="1000" id="62" name="PRIORI_SNR_ML_TUNING" type="int32"/>
-      <param default="15" id="63" name="DEC_PREV_NUM" type="int32"/>
-      <param default="1" id="64" name="SSC_ENABLE" type="int32"/>
-      <param default="930" id="65" name="SSC_SOFT_SMOOTHING_FACTOR" type="int32"/>
-      <param default="1600" id="66" name="SSC_OVERDRIVE" type="int32"/>
-      <param default="3" id="67" name="SSC_MIN_FREQ" type="int32"/>
-      <param default="130" id="68" name="SSC_MAX_FREQ" type="int32"/>
-      <param default="700" id="69" name="SSC_PSD_SMOOTHING_FACTOR" type="int32"/>
-      <param default="12" id="70" name="SSC_SOFT_DECISION_MIN_FREQ" type="int32"/>
-      <param default="450" id="71" name="SSC_SOFT_DECISION_MAX_FREQ" type="int32"/>
-      <param default="5" id="72" name="SSC_KEEP_SAVED_PROB_SMOOTH_SIZE" type="int32"/>
-      <param default="1000" id="73" name="GAIN_BOOSTING_COST" type="int32"/>
-    </module>
-    <module id="18" name="Multi Channel IIR 1">
-      <param default="0" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <param default="3" id="16" max="3" min="1" name="numOfChannel" type="uint32"/>
-      <param id="17" name="coeff" size="300" type="float"/>
-      <struct id="18">
-        <param max="18" min="-96" name="gain" size="60" type="float"/>
-        <param max="24000" min="0" name="frequency" size="60" type="uint32"/>
-        <param max="200" min="0" name="qfactor" size="60" type="float"/>
-        <param default="4" name="type" size="60" type="int32"/>
-      </struct>
-    </module>
-    <module id="32" name="Single Band DRC">
-      <param default="1" id="0" max="3" name="opMode_" type="uint32"/>
-      <param default="48000" id="1" name="fs_" type="uint32"/>
-      <param default="2" id="2" name="numCh_" type="uint32"/>
-      <param default="3" id="3" name="chMask_" type="uint32"/>
-      <struct id="16">
-        <param max="20" min="0" name="delay_ms" type="float"/>
-        <param default="5" max="20" min="0" minInclusive="false" name="rms_ms" type="float"/>
-        <param max="30" min="0" name="gain_dB" type="float"/>
-        <param max="30" min="-30" name="Min_Gain_dB" type="float"/>
-        <param default="1" max="3" min="1" name="numOfKnee" type="uint32"/>
-        <param name="threadhold_dB" size="3" type="float"/>
-        <param name="compressRatio" size="4" type="float"/>
-        <param name="kneeWidth" size="3" type="float"/>
-        <param name="attackTime_ms" size="4" type="float"/>
-        <param name="releaseTime_ms" size="4" type="float"/>
-        <param name="hysteresis" size="4" type="float"/>
-        <param default="0" max="1" min="0" name="rms_manual_enable" type="uint32"/>
-        <param default="0" max="2" min="0" name="rms_channel" type="uint32"/>
-      </struct>
-      <struct id="17">
-        <param max="30" min="-30" name="limiter_gain_dB" type="float"/>
-        <param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
-        <param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
-        <param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
-      </struct>
-    </module>
-    <module id="10000" name="Eraser">
-      <param id="275" name="eraser_pre_gain" type="uint32"/>
-      <param id="277" name="eraser_post_gain" type="uint32"/>
-      <param id="279" name="non_eraser_gain" type="uint32"/>
-    </module>
-    <module id="10001" name="Cleaner">
-      <param id="299" name="cleaner_post_gain" type="uint32"/>
-    </module>
-    <module id="10002" name="CHRE">
-      <param id="297" name="chre_gain" type="uint32"/>
-    </module>
-  </modules>
-  <signalflows>
-    <signalflow id="1" name="Spatial Audio">
-      <block id="128">
-        <moduleRef id="18"/>
-        <moduleRef id="17"/>
-      </block>
-      <block id="134">
-        <moduleRef id="14"/>
-        <moduleRef id="11"/>
-        <moduleRef id="6"/>
-        <moduleRef id="7"/>
-        <moduleRef id="5"/>
-        <moduleRef id="8"/>
-      </block>
-    </signalflow>
-    <signalflow id="2" name="General Mic Recording">
-      <block id="137">
-        <moduleRef id="14"/>
-        <moduleRef id="7"/>
-        <moduleRef id="8"/>
-      </block>
-    </signalflow>
-    <signalflow id="1000" name="Smart Feature">
-      <block id="0">
-        <moduleRef id="10000"/>
-        <moduleRef id="10001"/>
-        <moduleRef id="10002"/>
-      </block>
-    </signalflow>
-  </signalflows>
-</template>
--- a/audio/felix/tuning/bluenote/tuning_constraints_combination.xml
+++ b/audio/felix/tuning/bluenote/tuning_constraints_combination.xml
--- a/audio/felix/tuning/fortemedia/BLUETOOTH.mods
+++ b/audio/felix/tuning/fortemedia/BLUETOOTH.mods
--- a/audio/felix/tuning/fortemedia/HANDSET.mods
+++ b/audio/felix/tuning/fortemedia/HANDSET.mods
--- a/audio/felix/tuning/fortemedia/HANDSFREE.mods
+++ b/audio/felix/tuning/fortemedia/HANDSFREE.mods
--- a/audio/felix/tuning/fortemedia/HEADSET.mods
+++ b/audio/felix/tuning/fortemedia/HEADSET.mods
--- a/audio/felix/tuning/waves/tests/test_config.ini
+++ b/audio/felix/tuning/waves/tests/test_config.ini
@@ -1,58 +0,0 @@
-########################################################################################################
-# (Optional) The supported features list for platform vendors to query from.
-# Platform vendors should call maxxaudio_qdsp_is_feature_supported with a string to query from the list.
-# This config has no effect in the MaxxAudioQdspHalController. It's only meaningful for platform vendors.
-# Putting any value other than 1 would be equivalent to not supported.
-########################################################################################################
-[HAL_SUPPORTED_FEATURES]
-CUSTOM_ACTION_256=1
-
-########################################################################################################
-# This defined the options of supported sample rates.
-# This can be configured by Waves or platform vendor.
-########################################################################################################
-[HAL_SUPPORTED_SAMPLE_RATES]
-SR_COMMON   = 48000
-
-########################################################################################################
-# (Optional) The subtypes that applies to different angles(0, 90, 180, 270). Can be empty if not applicable.
-# This can be configured by Waves or platform vendor.
-########################################################################################################
-[HAL_ORIENTATION_SUBTYPES]
-OST_SPEAKER = 0:12,90:13,180:12,270:0|13
-
-########################################################################################################
-# This defines available preset configurations.
-# This should be configured by Waves only unless platform vendor is familiar with MPS structure.
-########################################################################################################
-[HAL_SUPPORTED_PRESETS]
-SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
-SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
-HEADSET_MUSIC = OM:2,SM:2
-
-########################################################################################################
-# This defines available CONTROL configurations. Only define the CONTROL if you need it.
-# The numbers could vary from device to device.
-# This can be configured by Waves or platform vendor.
-########################################################################################################
-[HAL_SUPPORTED_CONTROLS]
-SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
-A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-
-[COEFS_CONVERTER_SETTING]
-AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
-AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
-# do not modify the following if not necessary
-#AudioFormatType=0
-#AudioFormatChannels=2
-#AudioFormatSampleRate=48000
-#AudioFormatBitsPerSample=32
-#AudioFormatSampleSize=4
-#AudioFormatIncrement=8
-
-[CUSTOM_ACTION_256]
-CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC
-CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL
-CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC
--- a/audio/felix/tuning/waves/tests/test_preset.mps
+++ b/audio/felix/tuning/waves/tests/test_preset.mps
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -3,4 +3,10 @@
 # Uart port name
 UartPort = /dev/ttySAC18

+# Update BQR Event Mask property value
+BqrEventMaskValueUpdate = 295006
+
 BtOpusEnabled = true
+
+# Silent recover unimplement type packet when no device connected
+SilentRecoverUnimplementedPacket = true
--- a/conf/init.felix.rc
+++ b/conf/init.felix.rc
@@ -86,7 +86,7 @@ on early-boot
    start insmod_sh_felix
    chown system system /sys/class/power_supply/dualbatt/dbatt_stats

-service insmod_sh_felix /vendor/bin/insmod.sh /vendor/etc/init.insmod.felix.cfg
+service insmod_sh_felix /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.felix.cfg
    class main
    user root
    group root system
--- a/device-evolution.mk
+++ b/device-evolution.mk
@@ -1,8 +1,6 @@
 #
-# Copyright (C) 2024 The Evolution X Project
-#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
 # SPDX-License-Identifier: Apache-2.0
 #

-# Overlays
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-evolution
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -14,28 +14,11 @@
 # limitations under the License.
 #

-# Restrict the visibility of Android.bp files to improve build analysis time
-$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
-
-TARGET_KERNEL_DIR ?= device/google/felix-kernel
-TARGET_BOARD_KERNEL_HEADERS := device/google/felix-kernel/kernel-headers
 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT

-ifdef RELEASE_GOOGLE_FELIX_KERNEL_VERSION
-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_FELIX_KERNEL_VERSION)
-endif
-
-ifdef RELEASE_GOOGLE_FELIX_KERNEL_DIR
-TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)
-TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_FELIX_KERNEL_DIR)/kernel-headers
-endif
-
-$(call inherit-product-if-exists, vendor/google_devices/felix/prebuilts/device-vendor-felix.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs201/prebuilts/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/felix/proprietary/felix/device-vendor-felix.mk)
-$(call inherit-product-if-exists, vendor/google_devices/felix/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/felix/proprietary/WallpapersFelix.mk)
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_FELIX_VERSION)
+TARGET_KERNEL_DIR := device/google/felix-kernels/evolution
+TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers

 $(call inherit-product, device/google/felix/uwb/uwb_calibration_country.mk)

@@ -46,12 +29,11 @@ include device/google/gs201/device-shipping-common.mk
 $(call soong_config_set,fp_hal_feature,pixel_product, product_a)
 include device/google/felix/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/display/dump_second_display.mk
-include device/google/gs-common/touch/gti/gti.mk
-include device/google/gs-common/touch/stm/stm6.mk
-ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),)
+include device/google/gs-common/display/dump_exynos_second_display.mk
+include device/google/gs-common/touch/gti/predump_gti_dual.mk
+include device/google/gs-common/touch/stm/predump_stm6.mk
+
 include device/google/felix/uwb/uwb_calibration.mk
-endif

 # go/lyric-soong-variables
 $(call soong_config_set,lyric,camera_hardware,felix)
@@ -66,10 +48,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/felix/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.felix.rc

-# insmod files
-PRODUCT_COPY_FILES += \
-	device/google/felix/init.insmod.felix.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.felix.cfg
-
 # Camera
 PRODUCT_COPY_FILES += \
 	device/google/felix/media_profiles_felix.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
@@ -114,6 +92,12 @@ PRODUCT_PACKAGES += \
 	android.hardware.nfc-service.st \
 	NfcOverlayFelix

+# Shared Modem Platform
+SHARED_MODEM_PLATFORM_VENDOR := lassen
+
+# Shared Modem Platform
+include device/google/gs-common/modem/modem_svc_sit/shared_modem_platform.mk
+
 # SecureElement
 PRODUCT_PACKAGES += \
 	android.hardware.secure_element@1.2-service-gto \
@@ -146,6 +130,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
    persist.bluetooth.a2dp_offload.disabled=false \
    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus

+# Enable Bluetooth AutoOn feature
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.server.automatic_turn_on=true
+
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
    device/google/felix/bluetooth/bluetooth_power_limits_felix_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
@@ -167,14 +155,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
       ro.audio.spatializer_transaural_enabled_default=false \
       persist.vendor.audio.spatializer.speaker_enabled=true

-# Bluetooth SAR test tool
-PRODUCT_PACKAGES_DEBUG += \
-    sar_test
-
-# Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_DEBUG += \
-    hci_inject
-
 # Bluetooth
 PRODUCT_PRODUCT_PROPERTIES += \
    persist.bluetooth.a2dp_aac.vbr_supported=true
@@ -229,7 +209,26 @@ endif
 PRODUCT_VENDOR_PROPERTIES += \
    ro.vendor.build.svn=$(TARGET_SVN)

+# Set device family property for SMR
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.build.device_family=F10
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+    ifneq (,$(RELEASE_BASE_OS_FELIX))
+        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_FELIX)
+    endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+    ifneq (,$(RELEASE_BASE_OS_FELIX))
+        PRODUCT_PROPERTY_OVERRIDES += \
+        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_FELIX)
+    endif
+endif
 # Vibrator HAL
+$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 PRODUCT_VENDOR_PROPERTIES +=\
    ro.vendor.vibrator.hal.long.frequency.shift=0 \
    ro.vendor.vibrator.hal.gpio.num=44 \
@@ -237,8 +236,14 @@ PRODUCT_VENDOR_PROPERTIES +=\
    persist.vendor.vibrator.hal.chirp.enabled=0
 ACTUATOR_MODEL := luxshare_ict_lt_xlra1906d

+# Override Output Distortion Gain
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.audio.hapticgenerator.distortion.output.gain=0.52
+
 # Fingerprint
-include device/google/gs101/fingerprint/fpc1540/sw42/fpc1540.mk
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml
+
 FPC_MODULE_TYPE=1542_C
 # Fingerprint config
 include device/google/felix/fingerprint_config.mk
@@ -269,16 +274,6 @@ PRODUCT_PACKAGES += \
    SettingsOverlayG0B96 \
    SettingsOverlayG9FPL

-# Trusty liboemcrypto.so
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/24Q2
-else
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/felix/prebuilts/trusty/trunk
-endif
-
 # Set zram size
 PRODUCT_VENDOR_PROPERTIES += \
       vendor.zram.size=3g
@@ -292,16 +287,15 @@ PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.hardware.sensor.hinge_angle.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.hinge_angle.xml

 # Location
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_COPY_FILES += \
+    device/google/felix/location/lhd_user.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
+    device/google/felix/location/scd_user.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
    PRODUCT_COPY_FILES += \
-        device/google/felix/location/gps.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-        device/google/felix/location/lhd.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-        device/google/felix/location/scd.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+        device/google/felix/location/gps_user.6.1.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 else
    PRODUCT_COPY_FILES += \
-        device/google/felix/location/gps_user.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
-        device/google/felix/location/lhd_user.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
-        device/google/felix/location/scd_user.conf.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf
+        device/google/felix/location/gps_user.xml.f10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
 endif

 PRODUCT_PACKAGES += \
@@ -354,12 +348,6 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
    persist.bluetooth.opus.enabled=true

-# WLC eng specific
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-    PRODUCT_COPY_FILES += \
-        device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc
-endif
-
 # Bluetooth LE Audio
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.bluetooth.leaudio_offload.supported=true \
@@ -373,13 +361,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
    bluetooth.profile.vcp.controller.enabled=true \

 # Override BQR mask to enable LE Audio Choppy report
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=262238
-else
-PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=94
-endif
+    persist.bluetooth.bqr.event_mask=295006 \
+    persist.bluetooth.bqr.vnd_quality_mask=16 \
+    persist.bluetooth.bqr.vnd_trace_mask=0 \
+    persist.bluetooth.vendor.btsnoop=false

 # Bluetooth LE Audio CIS handover to SCO
 # Set the property only if the controller doesn't support CIS and SCO
@@ -397,11 +383,15 @@ PRODUCT_COPY_FILES += \

 # LE Audio Unicast Allowlist
 PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.leaudio.allow_list=SM-R510
+    persist.bluetooth.leaudio.allow_list=SM-R510,WF-1000XM5,SM-R630

-# Bluetooth EWP test tool
-PRODUCT_PACKAGES_DEBUG += \
-    ewp_tool
+# Disable Bluetooth HAP by default
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.profile.hap.enabled_by_default=false
+
+# Disable Bluetooth LE Audio toggle for ASHA device
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.leaudio.toggle_visible_for_asha=false

 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
@@ -420,3 +410,7 @@ PRODUCT_PACKAGES += \
    NoCutoutOverlay \
    AvoidAppsInCutoutOverlay

+# Bluetooth device id
+# Felix: 0x410C
+PRODUCT_PRODUCT_PROPERTIES += \
+    bluetooth.device_id.product_id=16652
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -1,11 +1,10 @@
 #
-# Copyright (C) 2023 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #

-# Overlays
-DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay-lineage
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-lineage

 # ANGLE - Almost Native Graphics Layer Engine
 PRODUCT_PACKAGES += \
@@ -18,23 +17,30 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
    EuiccSupportPixelOverlay

+# Fold extensions
+PRODUCT_SYSTEM_SERVER_JARS += \
+    system_ext:felix-services
+
 # HBM
 PRODUCT_PACKAGES += \
    HbmSVManagerOverlayFelix

-# Kernel
-TARGET_PREBUILT_KERNEL := device/google/felix-kernel/Image.lz4
+# IWLAN
+PRODUCT_PACKAGES += \
+    Iwlan

 # wireless_charger HAL service
 include device/google/gs-common/wireless_charger/wireless_charger.mk

 # Build necessary packages for vendor

-# Codec2
+# Dumpstate
 PRODUCT_PACKAGES += \
-    libacryl \
-    libacryl_hdr_plugin \
-    libexynosv4l2
+    dump_gsc.sh
+
+# GNSS
+PRODUCT_PACKAGES += \
+    android.hardware.sensors-V2-ndk.vendor:64

 # Graphics
 PRODUCT_PACKAGES += \
@@ -42,13 +48,6 @@ PRODUCT_PACKAGES += \
    libGLESv1_CM_angle \
    libGLESv2_angle

-# Identity credential
-PRODUCT_PACKAGES += \
-    android.hardware.identity_credential.xml
-
 # Sensors
 PRODUCT_PACKAGES += \
    sensors.dynamic_sensor_hal
-
-# Properties
-TARGET_VENDOR_PROP := $(LOCAL_PATH)/vendor.prop
--- a/device_framework_matrix_product_felix.xml
+++ b/device_framework_matrix_product_felix.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework" level="7">
    <hal format="aidl" optional="true">
      <name>com.google.hardware.pixel.display</name>
-        <version>10</version>
+        <version>13-15</version>
        <interface>
            <name>IDisplay</name>
            <instance>secondary</instance>
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -4,8 +4,13 @@
    "target_path": "device/google/gs201"
  },
  {
-    "repository": "device/google/felix-kernel",
-    "target_path": "device/google/felix-kernel",
-    "remote": "aosp-felix"
+    "remote": "evo-tensor",
+    "repository": "device_google_felix-kernels_evolution",
+    "target_path": "device/google/felix-kernels/evolution"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "vendor_google_felix",
+    "target_path": "vendor/google/felix"
  }
 ]
--- a/extract-files.py
+++ b/extract-files.py
@@ -0,0 +1,13 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+MY_DIR="$(cd "$(dirname "${0}")"; pwd -P)"
+
+pushd "${MY_DIR}/felix"
+./extract-files.py $@
+popd
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,149 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-set -e
-
-DEVICE=felix
-VENDOR=google
-
-# 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
-
-# If XML files don't have comments before the XML header, use this flag
-# Can still be used with broken XML files by using blob_fixup
-export TARGET_DISABLE_XML_FIXING=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
-
-ONLY_FIRMWARE=
-KANG=
-SECTION=
-CARRIER_SKIP_FILES=()
-VENDOR_SKIP_FILES=()
-
-while [ "${#}" -gt 0 ]; do
-    case "${1}" in
-        --only-firmware)
-            ONLY_FIRMWARE=true
-            ;;
-        -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
-        product/etc/felica/common.cfg)
-            [ "$2" = "" ] && return 0
-            sed -i -e '$a00000018,1' -e '/^00000014/d' -e '/^00000015/d' "${2}"
-            ;;
-        vendor/etc/init/init.modem_logging_control.rc)
-            [ "$2" = "" ] && return 0
-            sed -i 's/ && property:ro.debuggable=0//' "${2}"
-            ;;
-        *)
-            return 1
-            ;;
-    esac
-
-    return 0
-}
-
-function blob_fixup_dry() {
-    blob_fixup "$1" ""
-}
-
-function prepare_firmware() {
-    if [ "${SRC}" != "adb" ]; then
-        bash "${ANDROID_ROOT}"/lineage/scripts/pixel/prepare-firmware.sh "${DEVICE}" "${SRC}"
-    fi
-}
-
-# Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
-
-if [ -z "${ONLY_FIRMWARE}" ]; then
-    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-
-    generate_prop_list_from_image "product.img" "${MY_DIR}/proprietary-files-carriersettings.txt" CARRIER_SKIP_FILES carriersettings
-    extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-
-    readarray -t VENDOR_SKIP_FILES < <(cat "${MY_DIR}/skip-files-vendor.txt" | sed -E "/^[[:blank:]]*(#|$)/d")
-    VENDOR_TXT="${MY_DIR}/proprietary-files-vendor.txt"
-    generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES
-
-    # flp.default & gps.default have incorrect SONAME
-    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
-    set_disable_checkelf "vendor/lib/libExynosC2H263Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H263Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H264Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2H264Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2HevcDec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/hw/flp.default.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/hw/gps.default.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
-    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
-
-    set_module_suffix "vendor/lib/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
-    set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
-    set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}"
-
-    extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
-fi
-
-if [ -z "${SECTION}" ]; then
-    extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}"
-fi
-
-"${MY_DIR}/setup-makefiles.sh"
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Copyright 2023 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source ../../../common/clear-factory-images-variables.sh
-BUILD=9548499
-DEVICE=felix
-PRODUCT=felix
-VERSION=td3a.230201.001
-SRCPREFIX=signed-
-BOOTLOADER=felix-1.0-9477737
-RADIO=g5300n-230112-230118-b-9502391
-source ../../../common/generate-factory-images-common.sh
--- a/factory_felix.mk
+++ b/factory_felix.mk
@@ -1,34 +0,0 @@
-#
-# Copyright 2021 The Android Open-Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-TARGET_LINUX_KERNEL_VERSION := 5.10
-
-$(call inherit-product, device/google/gs201/factory_common.mk)
-$(call inherit-product, device/google/felix/device-felix.mk)
-include device/google/felix/audio/felix/factory-audio-tables.mk
-
-PRODUCT_NAME := factory_felix
-PRODUCT_DEVICE := felix
-PRODUCT_MODEL := Factory build on Felix
-PRODUCT_BRAND := Android
-PRODUCT_MANUFACTURER := Google
-
-# default BDADDR for EVB only
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.vendor.bluetooth.evb_bdaddr="22:22:22:33:44:55"
-
-# Factory binary of camera
-PRODUCT_PACKAGES += fatp_f10_wide_hat_tool fatp_f10_tele_hat_tool
--- a/felix/Android.bp
+++ b/felix/Android.bp
@@ -0,0 +1,11 @@
+//
+// SPDX-FileCopyrightText: 2024 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+prebuilt_etc {
+    name: "init.recovery.felix.touch.rc",
+    src: "init.recovery.touch.rc",
+    sub_dir: "init",
+    recovery: true,
+}
--- a/felix/BoardConfig.mk
+++ b/felix/BoardConfig.mk
@@ -21,18 +21,15 @@ USES_DEVICE_GOOGLE_FELIX := true
 BOARD_KERNEL_CMDLINE += swiotlb=noforce

 RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_FELIX_RADIO_DIR)
-ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
-else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
-else
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
-endif
+RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR)
+$(call soong_config_set,felix_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_FELIX_DIR))

 # Enable load module in parallel
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true

 # The modules which need to be loaded in sequential
+BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += panel-samsung-ana6707-f10.load_sequential=1
 BOARD_KERNEL_CMDLINE += s2mpg12-regulator.load_sequential=1
@@ -41,9 +38,11 @@ BOARD_KERNEL_CMDLINE += s2mpg12-regulator.load_sequential=1
 USES_IDISPLAY_INTF_SEC := true

 include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
-include vendor/google_devices/felix/proprietary/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 include device/google/felix/sepolicy/felix-sepolicy.mk
 include device/google/felix/wifi/BoardConfig-wifi.mk

-include device/google/felix/felix/BoardConfigLineage.mk
+DEVICE_PATH := device/google/felix
+VENDOR_PATH := vendor/google/felix
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
--- a/felix/BoardConfigEvolution.mk
+++ b/felix/BoardConfigEvolution.mk
@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+include $(DEVICE_PATH)/BoardConfigEvolution.mk
--- a/felix/BoardConfigLineage.mk
+++ b/felix/BoardConfigLineage.mk
@@ -1,9 +1,9 @@
 #
-# Copyright (C) 2023 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #

-include device/google/felix/BoardConfigLineage.mk
+include $(DEVICE_PATH)/BoardConfigLineage.mk

-include vendor/google/felix/BoardConfigVendor.mk
+include $(VENDOR_PATH)/BoardConfigVendor.mk
--- a/felix/device-evolution.mk
+++ b/felix/device-evolution.mk
@@ -0,0 +1,8 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
--- a/felix/device-lineage.mk
+++ b/felix/device-lineage.mk
@@ -0,0 +1,13 @@
+#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# SPDX-License-Identifier: Apache-2.0
+#
+
+$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
+
+# Init
+PRODUCT_PACKAGES += \
+    init.recovery.felix.touch.rc
--- a/felix/extract-files.py
+++ b/felix/extract-files.py
@@ -0,0 +1,105 @@
+#!/usr/bin/env -S PYTHONPATH=../../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.extract import extract_fns_user_type
+from extract_utils.extract_pixel import (
+    extract_pixel_factory_image,
+    extract_pixel_firmware,
+    pixel_factory_image_regex,
+    pixel_firmware_regex,
+)
+from extract_utils.file import FileArgs, FileList
+from extract_utils.fixups_blob import (
+    blob_fixup,
+    blob_fixups_user_type,
+)
+from extract_utils.fixups_lib import (
+    lib_fixup_remove,
+    lib_fixups,
+    lib_fixups_user_type,
+)
+from extract_utils.main import (
+    ExtractUtils,
+    ExtractUtilsModule,
+)
+
+namespace_imports = [
+    'device/google/felix',
+    'hardware/google/av',
+    'hardware/google/interfaces',
+    'hardware/google/pixel',
+]
+
+
+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.google.edgetpu_app_service-V3-ndk',
+        'com.google.edgetpu_vendor_service-V2-ndk',
+    ): lib_fixup_vendor_suffix,
+    'android.hardware.sensors-V2-ndk': lib_fixup_remove,
+}
+
+blob_fixups: blob_fixups_user_type = {
+    'product/etc/felica/common.cfg': blob_fixup()
+        .patch_file('osaifu-keitai.patch'),
+    'vendor/etc/init/init.modem_logging_control.rc': blob_fixup()
+        .regex_replace(' && property:ro.debuggable=0', ''),
+}  # fmt: skip
+
+extract_fns: extract_fns_user_type = {
+    pixel_factory_image_regex: extract_pixel_factory_image,
+    pixel_firmware_regex: extract_pixel_firmware,
+}
+
+module = ExtractUtilsModule(
+    'felix',
+    'google',
+    device_rel_path='device/google/felix/felix',
+    blob_fixups=blob_fixups,
+    lib_fixups=lib_fixups,
+    namespace_imports=namespace_imports,
+    add_generated_carriersettings_file=True,
+    add_firmware_proprietary_file=True,
+    extract_fns=extract_fns,
+)
+
+
+def fix_vendor_file_list(file_list: FileList):
+    # flp.default & gps.default have incorrect SONAME
+    # gpsd depends on android.hardware.sensors-V2-ndk & android.hardware.sensors-V3-ndk
+    disable_checkelf_file_paths = [
+        'vendor/bin/hw/gpsd',
+        'vendor/lib64/hw/flp.default.so',
+        'vendor/lib64/hw/gps.default.so',
+    ]
+    for file_path in disable_checkelf_file_paths:
+        file_list.get_file(file_path).set_arg(FileArgs.DISABLE_CHECKELF, True)
+
+    module_suffix_file_paths = [
+        'vendor/lib/com.google.edgetpu_app_service-V3-ndk.so',
+        'vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so',
+        'vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so',
+    ]
+
+    for file_path in module_suffix_file_paths:
+        file_list.get_file(file_path).set_arg(FileArgs.MODULE_SUFFIX, '_vendor')
+
+
+module.add_generated_proprietary_file(
+    'proprietary-files-vendor.txt',
+    partition='vendor',
+    skip_file_list_name='skip-files-vendor.txt',
+    fix_file_list=fix_vendor_file_list,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device(module)
+    utils.run()
--- a/felix/init.recovery.touch.rc
+++ b/felix/init.recovery.touch.rc
@@ -0,0 +1,4 @@
+on init
+   insmod /lib/modules/goog_touch_interface.ko
+   insmod /lib/modules/fst2.ko
+   insmod /lib/modules/ftm5.ko
--- a/felix/osaifu-keitai.patch
+++ b/felix/osaifu-keitai.patch
@@ -0,0 +1,24 @@
+From aab255f2807cfc460c0dce40decd5554d49c0076 Mon Sep 17 00:00:00 2001
+From: jabashque <jabashque@gmail.com>
+Date: Mon, 5 Feb 2024 21:36:03 +0000
+Subject: [PATCH 1/1] Enable Osaifu-Keitai on non-Japanese SKUs
+
+---
+ common.cfg | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/common.cfg b/common.cfg
+index 3b78765..00f53cb 100644
+--- a/common.cfg
+++ b/common.cfg
+@@ -11,6 +11,5 @@
+ 02030001,0
+ 02030002,0
+ 02030003,intent:#Intent;action=android.settings.NFC_SETTINGS;end
+-00000014,content://com.google.android.pixelnfc.provider.DeviceInfoContentProvider/isJapanSku
+-00000015,is_japan_sku
+ 00000016,0001
+00000018,1
+-- 
+2.47.0
+
--- a/felix/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
+++ b/felix/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
--- a/felix/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/felix/overlay/frameworks/base/core/res/res/values/config.xml
@@ -221,6 +221,9 @@
    <!-- Indicates whether to enable hinge angle sensor when using unfold animation -->
    <bool name="config_unfoldTransitionHingeAngle">true</bool>

+    <!-- Indicates whether to enable haptics during unfold animation -->
+    <bool name="config_unfoldTransitionHapticsEnabled">true</bool>
+
    <!-- Timeout for receiving the keyguard drawn event from System UI.  -->
    <integer name="config_keyguardDrawnTimeout">1700</integer>

--- a/felix/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/felix/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -16,6 +16,6 @@
 */
 -->
 <resources>
-   <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">50px</dimen>
+    <!-- Default paddings for content around the corners. -->
+    <dimen name="rounded_corner_content_padding">14dp</dimen>
 </resources>
--- a/felix/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/felix/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -151,13 +151,17 @@
    </array>

    <!-- Additional power used when screen is ambient mode -->
-    <item name="ambient.on">32</item>
+    <item name="ambient.on.display0">32</item>
+    <item name="ambient.on.display1">32</item>

    <!-- Additional power used when screen is turned on at minimum brightness -->
-    <item name="screen.on">98</item>
+    <item name="screen.on.display0">98</item>
+    <item name="screen.on.display1">98</item>
+
    <!-- Additional power used when screen is at maximum brightness, compared to
         screen at minimum brightness -->
-    <item name="screen.full">470</item>
+    <item name="screen.full.display0">470</item>
+    <item name="screen.full.display1">470</item>

    <!-- Average power used by the camera flash module when on -->
    <item name="camera.flashlight">240.47</item>
--- a/felix/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml
+++ b/felix/overlay/frameworks/base/packages/SettingsLib/res/values/dimens.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020-2023 The LineageOS Project
+<!-- Copyright (C) 2024 The Android Open Source Project

     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,6 +14,5 @@
     limitations under the License.
 -->
 <resources>
-    <!-- Whether to show advanced display rotation settings -->
-    <bool name="config_show_advanced_rotation_settings">false</bool>
+    <fraction name="display_density_max_scale">116.79993%</fraction>
 </resources>
--- a/felix/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values-land/dimen.xml
@@ -16,10 +16,6 @@
 */
 -->
 <resources>
-    <!-- Landscape, just use the regular values -->
-    <dimen name="status_bar_padding_start">8dp</dimen>
-    <dimen name="status_bar_padding_end">8dp</dimen>
-
    <!-- the padding on the top of the statusbar (usually 0) -->
    <dimen name="status_bar_padding_top">0dp</dimen>
 </resources>
--- a/felix/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/styles.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values-sw600dp-land/styles.xml
@@ -16,7 +16,7 @@

 <resources xmlns:android="http://schemas.android.com/apk/res/android">

-    <style name="AuthCredentialPatternContainerStyle">
+    <style name="AuthNonBioCredentialPatternContainerStyle">
        <item name="android:gravity">center</item>
        <item name="android:maxHeight">@dimen/biometric_auth_pattern_view_max_size</item>
        <item name="android:maxWidth">@dimen/biometric_auth_pattern_view_max_size</item>
--- a/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -148,5 +148,8 @@
         4 : DEVICE_POSTURE_FLIPPED
    -->
    <integer name="config_face_auth_supported_posture">1</integer>
+
+    <!--  Whether to use a machine learning model for back gesture falsing. -->
+    <bool name="config_useBackGestureML">false</bool>
 </resources>

--- a/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/felix/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,21 +16,20 @@
 */
 -->
 <resources>
-    <!-- Don't need the left side padding due to being inset from the cutout -->
+    <!-- the padding on the start of the statusbar -->
    <dimen name="status_bar_padding_start">0dp</dimen>

    <!-- the padding on the top of the statusbar (usually 0) -->
    <dimen name="status_bar_padding_top">1px</dimen>

-    <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
-    The icons always have a 4dp padding in the container so we only need 56 extra px of padding
-    for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen>
+    <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>

-    <!-- Multi user switch has some intrinsic padding to it -->
-    <dimen name="multi_user_switch_keyguard_margin">40px</dimen>
+    <!-- Margin on the left side of the carrier text on Keyguard -->
+    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>

-    <dimen name="keyguard_carrier_text_margin">0px</dimen>
+    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>

    <dimen name="config_rounded_mask_size">71px</dimen>
    <dimen name="config_rounded_mask_size_top">71px</dimen>
--- a/felix/proprietary-files-carriersettings.txt
+++ b/felix/proprietary-files-carriersettings.txt
@@ -1,16 +1,25 @@
 # All blobs below are extracted from the release mentioned in proprietary-files.txt
 product/etc/CarrierSettings/1and1_de.pb
 product/etc/CarrierSettings/2degrees_nz.pb
+product/etc/CarrierSettings/321communications_us.pb
+product/etc/CarrierSettings/48_ie.pb
 product/etc/CarrierSettings/4ka_sk.pb
 product/etc/CarrierSettings/a1_at.pb
 product/etc/CarrierSettings/a1_bg.pb
 product/etc/CarrierSettings/a1_hr.pb
 product/etc/CarrierSettings/a1_mk.pb
 product/etc/CarrierSettings/a1_si.pb
+product/etc/CarrierSettings/a1mpn_at.pb
 product/etc/CarrierSettings/ahamo_jp.pb
+product/etc/CarrierSettings/airbus_de.pb
+product/etc/CarrierSettings/airbus_fr.pb
 product/etc/CarrierSettings/airtel_in.pb
 product/etc/CarrierSettings/ais_th.pb
+product/etc/CarrierSettings/alcom_fi.pb
+product/etc/CarrierSettings/alestra_mx.pb
+product/etc/CarrierSettings/aliv_bs.pb
 product/etc/CarrierSettings/altice_us.pb
+product/etc/CarrierSettings/alticeroaming_us.pb
 product/etc/CarrierSettings/andorratelecom_ad.pb
 product/etc/CarrierSettings/antel_uy.pb
 product/etc/CarrierSettings/appalachian_us.pb
@@ -18,12 +27,18 @@ product/etc/CarrierSettings/apt_tw.pb
 product/etc/CarrierSettings/asda_gb.pb
 product/etc/CarrierSettings/assurance_us.pb
 product/etc/CarrierSettings/astca_as.pb
+product/etc/CarrierSettings/astoundbroadband_us.pb
+product/etc/CarrierSettings/att4g_mx.pb
 product/etc/CarrierSettings/att5g_us.pb
 product/etc/CarrierSettings/att5gsa_us.pb
 product/etc/CarrierSettings/att_mx.pb
 product/etc/CarrierSettings/att_us.pb
 product/etc/CarrierSettings/attbootstrap_us.pb
+product/etc/CarrierSettings/attmvnos_mx.pb
 product/etc/CarrierSettings/attmvnos_us.pb
+product/etc/CarrierSettings/axis_id.pb
+product/etc/CarrierSettings/bait_mx.pb
+product/etc/CarrierSettings/bark_us.pb
 product/etc/CarrierSettings/base_be.pb
 product/etc/CarrierSettings/batelco_bh.pb
 product/etc/CarrierSettings/bell_ca.pb
@@ -44,12 +59,17 @@ product/etc/CarrierSettings/celcom_my.pb
 product/etc/CarrierSettings/cellcom_il.pb
 product/etc/CarrierSettings/cellcom_us.pb
 product/etc/CarrierSettings/cellcommno_us.pb
+product/etc/CarrierSettings/cellfie_ge.pb
 product/etc/CarrierSettings/celluarone_us.pb
 product/etc/CarrierSettings/chatr_ca.pb
 product/etc/CarrierSettings/chinamobile_hk.pb
 product/etc/CarrierSettings/cht_tw.pb
 product/etc/CarrierSettings/cityfone_ca.pb
+product/etc/CarrierSettings/claro_br.pb
+product/etc/CarrierSettings/claro_cl.pb
+product/etc/CarrierSettings/claro_co.pb
 product/etc/CarrierSettings/claro_pr.pb
+product/etc/CarrierSettings/commonmvnxatt_us.pb
 product/etc/CarrierSettings/congstar_de.pb
 product/etc/CarrierSettings/consumercellularatt_us.pb
 product/etc/CarrierSettings/consumercellulartmo_us.pb
@@ -64,6 +84,7 @@ product/etc/CarrierSettings/cspire_us.pb
 product/etc/CarrierSettings/default.pb
 product/etc/CarrierSettings/digi_hu.pb
 product/etc/CarrierSettings/digi_my.pb
+product/etc/CarrierSettings/digi_pt.pb
 product/etc/CarrierSettings/digi_ro.pb
 product/etc/CarrierSettings/digimobil_es.pb
 product/etc/CarrierSettings/dish5gsa_us.pb
@@ -72,17 +93,23 @@ product/etc/CarrierSettings/dito_ph.pb
 product/etc/CarrierSettings/dna_fi.pb
 product/etc/CarrierSettings/docomo_jp.pb
 product/etc/CarrierSettings/docomomvno_jp.pb
+product/etc/CarrierSettings/docomopacific_us.pb
 product/etc/CarrierSettings/dtac_th.pb
 product/etc/CarrierSettings/du_ae.pb
 product/etc/CarrierSettings/eastlink_ca.pb
 product/etc/CarrierSettings/ee_gb.pb
+product/etc/CarrierSettings/eeyoumobility_ca.pb
 product/etc/CarrierSettings/eir_ie.pb
 product/etc/CarrierSettings/elisa1_fi.pb
 product/etc/CarrierSettings/elisa2_fi.pb
 product/etc/CarrierSettings/elisa_ee.pb
+product/etc/CarrierSettings/enetworks_gy.pb
 product/etc/CarrierSettings/enreach_nl.pb
+product/etc/CarrierSettings/entel_cl.pb
+product/etc/CarrierSettings/epic_mt.pb
 product/etc/CarrierSettings/eplus_de.pb
 product/etc/CarrierSettings/erate_no.pb
+product/etc/CarrierSettings/esimgo_gb.pb
 product/etc/CarrierSettings/esn_gb.pb
 product/etc/CarrierSettings/etisalat_ae.pb
 product/etc/CarrierSettings/euskaltel_es.pb
@@ -90,7 +117,7 @@ product/etc/CarrierSettings/evolve_us.pb
 product/etc/CarrierSettings/fastweb_it.pb
 product/etc/CarrierSettings/fet_tw.pb
 product/etc/CarrierSettings/fi_at.pb
-product/etc/CarrierSettings/fi_us.pb
+product/etc/CarrierSettings/fi_tmo_us.pb
 product/etc/CarrierSettings/fido_ca.pb
 product/etc/CarrierSettings/finetwork_es.pb
 product/etc/CarrierSettings/firstnet_us.pb
@@ -98,7 +125,11 @@ product/etc/CarrierSettings/firstnetpacific2_us.pb
 product/etc/CarrierSettings/firstnetpacific_us.pb
 product/etc/CarrierSettings/fizz_ca.pb
 product/etc/CarrierSettings/fl1_li.pb
+product/etc/CarrierSettings/fliggsmobile_us.pb
+product/etc/CarrierSettings/foroyatele_fo.pb
 product/etc/CarrierSettings/free_fr.pb
+product/etc/CarrierSettings/free_gp.pb
+product/etc/CarrierSettings/free_mq.pb
 product/etc/CarrierSettings/free_re.pb
 product/etc/CarrierSettings/freedommobile_ca.pb
 product/etc/CarrierSettings/gamma_gb.pb
@@ -107,23 +138,38 @@ product/etc/CarrierSettings/gibtel_gi.pb
 product/etc/CarrierSettings/giffgaff_gb.pb
 product/etc/CarrierSettings/giga_sg.pb
 product/etc/CarrierSettings/globe_ph.pb
+product/etc/CarrierSettings/gomobile_mt.pb
+product/etc/CarrierSettings/grameenphone_bd.pb
+product/etc/CarrierSettings/gta_us.pb
 product/etc/CarrierSettings/guuk_es.pb
 product/etc/CarrierSettings/h3_at.pb
 product/etc/CarrierSettings/h3_gb.pb
 product/etc/CarrierSettings/h3_ie.pb
+product/etc/CarrierSettings/h3_lk.pb
 product/etc/CarrierSettings/h3_se.pb
 product/etc/CarrierSettings/h3g27202_ie.pb
 product/etc/CarrierSettings/halebop_se.pb
+product/etc/CarrierSettings/helium_us.pb
 product/etc/CarrierSettings/help_at.pb
 product/etc/CarrierSettings/homobile_it.pb
 product/etc/CarrierSettings/hotmobile_il.pb
+product/etc/CarrierSettings/humane_us.pb
 product/etc/CarrierSettings/ice_no.pb
 product/etc/CarrierSettings/idea_in.pb
 product/etc/CarrierSettings/idmobile_gb.pb
 product/etc/CarrierSettings/iliad_it.pb
+product/etc/CarrierSettings/indosat_id.pb
 product/etc/CarrierSettings/inland_us.pb
+product/etc/CarrierSettings/iwireless_us.pb
+product/etc/CarrierSettings/izziatt_mx.pb
+product/etc/CarrierSettings/jazz_pk.pb
 product/etc/CarrierSettings/jazztel_es.pb
+product/etc/CarrierSettings/jcommobile_jp.pb
+product/etc/CarrierSettings/joonto_us.pb
+product/etc/CarrierSettings/kajeetmvno_us.pb
+product/etc/CarrierSettings/kddi5gsa_jp.pb
 product/etc/CarrierSettings/kddi_jp.pb
+product/etc/CarrierSettings/kddimvno5gsa_jp.pb
 product/etc/CarrierSettings/kddimvno_jp.pb
 product/etc/CarrierSettings/kena_it.pb
 product/etc/CarrierSettings/koodo_ca.pb
@@ -131,6 +177,7 @@ product/etc/CarrierSettings/kpn_nl.pb
 product/etc/CarrierSettings/lebara_es.pb
 product/etc/CarrierSettings/lebara_fr.pb
 product/etc/CarrierSettings/lebara_gb.pb
+product/etc/CarrierSettings/lebara_nl.pb
 product/etc/CarrierSettings/liberty_pr.pb
 product/etc/CarrierSettings/lifecell_ua.pb
 product/etc/CarrierSettings/linemo_jp.pb
@@ -140,21 +187,41 @@ product/etc/CarrierSettings/lowi_es.pb
 product/etc/CarrierSettings/luckymobile_ca.pb
 product/etc/CarrierSettings/lum_ca.pb
 product/etc/CarrierSettings/lyca_es.pb
+product/etc/CarrierSettings/lyca_us.pb
+product/etc/CarrierSettings/lycamobile_gb.pb
+product/etc/CarrierSettings/lycamobile_pt.pb
+product/etc/CarrierSettings/lycamobile_se.pb
 product/etc/CarrierSettings/m1_sg.pb
+product/etc/CarrierSettings/magticom_ge.pb
 product/etc/CarrierSettings/manxcontract_im.pb
 product/etc/CarrierSettings/manxprepaid_im.pb
 product/etc/CarrierSettings/masmovil_es.pb
 product/etc/CarrierSettings/maxis_my.pb
+product/etc/CarrierSettings/mediacom_us.pb
+product/etc/CarrierSettings/megamovil_mx.pb
+product/etc/CarrierSettings/melita_mt.pb
 product/etc/CarrierSettings/meo_pt.pb
 product/etc/CarrierSettings/metropcs_us.pb
+product/etc/CarrierSettings/mettel_us.pb
+product/etc/CarrierSettings/mobifone_vn.pb
 product/etc/CarrierSettings/mobily_sa.pb
 product/etc/CarrierSettings/monacotelecom_mc.pb
+product/etc/CarrierSettings/movistar_cl.pb
+product/etc/CarrierSettings/movistar_co.pb
 product/etc/CarrierSettings/movistar_es.pb
 product/etc/CarrierSettings/movistar_mx.pb
+product/etc/CarrierSettings/mucho_ch.pb
+product/etc/CarrierSettings/mvnoconnect_us.pb
+product/etc/CarrierSettings/nema_fo.pb
+product/etc/CarrierSettings/netcomgroup_fr.pb
+product/etc/CarrierSettings/newww_mx.pb
+product/etc/CarrierSettings/nexphone_ch.pb
 product/etc/CarrierSettings/nextech_us.pb
+product/etc/CarrierSettings/no_sim.pb
 product/etc/CarrierSettings/nos_pt.pb
 product/etc/CarrierSettings/nova_gr.pb
 product/etc/CarrierSettings/nova_is.pb
+product/etc/CarrierSettings/nymobile_us.pb
 product/etc/CarrierSettings/o2_cz.pb
 product/etc/CarrierSettings/o2_de.pb
 product/etc/CarrierSettings/o2_sk.pb
@@ -162,9 +229,12 @@ product/etc/CarrierSettings/o2postpaid_gb.pb
 product/etc/CarrierSettings/o2prepaid_de.pb
 product/etc/CarrierSettings/o2prepaid_gb.pb
 product/etc/CarrierSettings/omantel_om.pb
+product/etc/CarrierSettings/one_me.pb
 product/etc/CarrierSettings/onecall_no.pb
+product/etc/CarrierSettings/only_yt.pb
 product/etc/CarrierSettings/ooredoo_kw.pb
 product/etc/CarrierSettings/ooredoo_qa.pb
+product/etc/CarrierSettings/optimera_us.pb
 product/etc/CarrierSettings/optus_au.pb
 product/etc/CarrierSettings/orange_be.pb
 product/etc/CarrierSettings/orange_es.pb
@@ -176,24 +246,35 @@ product/etc/CarrierSettings/orange_re.pb
 product/etc/CarrierSettings/orange_ro.pb
 product/etc/CarrierSettings/orange_sk.pb
 product/etc/CarrierSettings/others.pb
+product/etc/CarrierSettings/oxio_us.pb
 product/etc/CarrierSettings/paradisemobile_bm.pb
 product/etc/CarrierSettings/partner_il.pb
 product/etc/CarrierSettings/pcmobilebell_ca.pb
 product/etc/CarrierSettings/pelephone_il.pb
 product/etc/CarrierSettings/pepephone_es.pb
 product/etc/CarrierSettings/play_pl.pb
+product/etc/CarrierSettings/plintron_us.pb
 product/etc/CarrierSettings/plus_pl.pb
 product/etc/CarrierSettings/post_lu.pb
+product/etc/CarrierSettings/postemobile_it.pb
+product/etc/CarrierSettings/povo5gsa_jp.pb
 product/etc/CarrierSettings/povo_jp.pb
 product/etc/CarrierSettings/proximus_be.pb
 product/etc/CarrierSettings/publicmobile_ca.pb
+product/etc/CarrierSettings/pwg_us.pb
+product/etc/CarrierSettings/qlink_us.pb
 product/etc/CarrierSettings/r_es.pb
 product/etc/CarrierSettings/racc_es.pb
 product/etc/CarrierSettings/rakuten_jp.pb
-product/etc/CarrierSettings/reachmobileatt_us.pb
+product/etc/CarrierSettings/reach_us.pb
+product/etc/CarrierSettings/reallycommunications_us.pb
 product/etc/CarrierSettings/redpocketatt_us.pb
 product/etc/CarrierSettings/redpockettmo_us.pb
+product/etc/CarrierSettings/republicwireless_us.pb
 product/etc/CarrierSettings/rjio_in.pb
+product/etc/CarrierSettings/robi_bd.pb
+product/etc/CarrierSettings/roccstar_us.pb
+product/etc/CarrierSettings/rockisland_us.pb
 product/etc/CarrierSettings/rogers5g_ca.pb
 product/etc/CarrierSettings/rogers_ca.pb
 product/etc/CarrierSettings/rogerswpn_ca.pb
@@ -210,34 +291,49 @@ product/etc/CarrierSettings/singtel_sg.pb
 product/etc/CarrierSettings/skinny_nz.pb
 product/etc/CarrierSettings/skt_kr.pb
 product/etc/CarrierSettings/sky_gb.pb
+product/etc/CarrierSettings/sky_ie.pb
+product/etc/CarrierSettings/sky_mx.pb
 product/etc/CarrierSettings/skylo_zz.pb
 product/etc/CarrierSettings/smart_ph.pb
+product/etc/CarrierSettings/smartfren_id.pb
+product/etc/CarrierSettings/smartless_us.pb
 product/etc/CarrierSettings/smartone_hk.pb
 product/etc/CarrierSettings/smarty_gb.pb
 product/etc/CarrierSettings/softbank_jp.pb
 product/etc/CarrierSettings/solomobile_ca.pb
 product/etc/CarrierSettings/spark_nz.pb
 product/etc/CarrierSettings/spectrum_us.pb
+product/etc/CarrierSettings/spectrummso_us.pb
+product/etc/CarrierSettings/spectrummsotest_us.pb
 product/etc/CarrierSettings/spmtelecom_pm.pb
 product/etc/CarrierSettings/sprint_us.pb
 product/etc/CarrierSettings/sprintprepaid_us.pb
 product/etc/CarrierSettings/sprintwholesale_us.pb
 product/etc/CarrierSettings/spusu_at.pb
+product/etc/CarrierSettings/spusu_ch.pb
+product/etc/CarrierSettings/spusu_gb.pb
+product/etc/CarrierSettings/spusu_it.pb
+product/etc/CarrierSettings/ssimobile_ca.pb
 product/etc/CarrierSettings/starhub_sg.pb
 product/etc/CarrierSettings/stc_bh.pb
 product/etc/CarrierSettings/stc_kw.pb
 product/etc/CarrierSettings/stc_sa.pb
 product/etc/CarrierSettings/strata_us.pb
 product/etc/CarrierSettings/sunrise_ch.pb
+product/etc/CarrierSettings/superdrug_gb.pb
 product/etc/CarrierSettings/sweno_es.pb
 product/etc/CarrierSettings/swisscom_ch.pb
 product/etc/CarrierSettings/swisscom_li.pb
+product/etc/CarrierSettings/swisscommvno_ch.pb
 product/etc/CarrierSettings/talkmobile_gb.pb
 product/etc/CarrierSettings/tango_lu.pb
 product/etc/CarrierSettings/tango_us.pb
 product/etc/CarrierSettings/tbaytel_ca.pb
+product/etc/CarrierSettings/tchibo_at.pb
 product/etc/CarrierSettings/tchibo_de.pb
 product/etc/CarrierSettings/tdc_dk.pb
+product/etc/CarrierSettings/telavox_be.pb
+product/etc/CarrierSettings/telavox_se.pb
 product/etc/CarrierSettings/telcel_mx.pb
 product/etc/CarrierSettings/telco_re.pb
 product/etc/CarrierSettings/tele2_ee.pb
@@ -249,15 +345,18 @@ product/etc/CarrierSettings/telekom_de.pb
 product/etc/CarrierSettings/telekom_gr.pb
 product/etc/CarrierSettings/telekom_hr.pb
 product/etc/CarrierSettings/telekom_hu.pb
+product/etc/CarrierSettings/telekom_me.pb
 product/etc/CarrierSettings/telekom_mk.pb
 product/etc/CarrierSettings/telekom_pl.pb
 product/etc/CarrierSettings/telekom_ro.pb
 product/etc/CarrierSettings/telekom_si.pb
 product/etc/CarrierSettings/telekom_sk.pb
+product/etc/CarrierSettings/telemach_hr.pb
 product/etc/CarrierSettings/telemach_si.pb
 product/etc/CarrierSettings/telenet_be.pb
 product/etc/CarrierSettings/telenor_dk.pb
 product/etc/CarrierSettings/telenor_no.pb
+product/etc/CarrierSettings/telenor_pk.pb
 product/etc/CarrierSettings/telenor_se.pb
 product/etc/CarrierSettings/telia_dk.pb
 product/etc/CarrierSettings/telia_ee.pb
@@ -265,15 +364,21 @@ product/etc/CarrierSettings/telia_fi.pb
 product/etc/CarrierSettings/telia_lt.pb
 product/etc/CarrierSettings/telia_no.pb
 product/etc/CarrierSettings/telia_se.pb
+product/etc/CarrierSettings/telkomsel_id.pb
+product/etc/CarrierSettings/tello_us.pb
 product/etc/CarrierSettings/telstra_au.pb
 product/etc/CarrierSettings/telus_ca.pb
 product/etc/CarrierSettings/tesco_gb.pb
+product/etc/CarrierSettings/test001_zz.pb
 product/etc/CarrierSettings/three_dk.pb
+product/etc/CarrierSettings/tigo_co.pb
+product/etc/CarrierSettings/tim_br.pb
 product/etc/CarrierSettings/tim_it.pb
 product/etc/CarrierSettings/tmobile_at.pb
 product/etc/CarrierSettings/tmobile_cz.pb
 product/etc/CarrierSettings/tmobile_nl.pb
 product/etc/CarrierSettings/tmobile_us.pb
+product/etc/CarrierSettings/tmobileprivate_us.pb
 product/etc/CarrierSettings/tmomvno_nl.pb
 product/etc/CarrierSettings/tmomvno_us.pb
 product/etc/CarrierSettings/tracfoneatt_us.pb
@@ -285,23 +390,29 @@ product/etc/CarrierSettings/truphone_zz.pb
 product/etc/CarrierSettings/tstar_tw.pb
 product/etc/CarrierSettings/turkcell_tr.pb
 product/etc/CarrierSettings/turktelekom_tr.pb
+product/etc/CarrierSettings/tusass_gl.pb
 product/etc/CarrierSettings/twm_tw.pb
 product/etc/CarrierSettings/u264a_ca.pb
 product/etc/CarrierSettings/u264a_us.pb
 product/etc/CarrierSettings/u264ab_ca.pb
 product/etc/CarrierSettings/u264ao_at.pb
 product/etc/CarrierSettings/u264ap_at.pb
+product/etc/CarrierSettings/ubixatt_mx.pb
 product/etc/CarrierSettings/ultra_us.pb
 product/etc/CarrierSettings/umobile_my.pb
 product/etc/CarrierSettings/unifi_my.pb
 product/etc/CarrierSettings/unionwireless_us.pb
+product/etc/CarrierSettings/unitedwireless_us.pb
 product/etc/CarrierSettings/uqmobile5gsa_jp.pb
 product/etc/CarrierSettings/uqmobile_jp.pb
 product/etc/CarrierSettings/uscc_us.pb
 product/etc/CarrierSettings/verizon_us.pb
+product/etc/CarrierSettings/verizononsitelte_us.pb
 product/etc/CarrierSettings/verymobile_it.pb
 product/etc/CarrierSettings/viaero_us.pb
+product/etc/CarrierSettings/vianova_it.pb
 product/etc/CarrierSettings/videotron_ca.pb
+product/etc/CarrierSettings/viettel_vn.pb
 product/etc/CarrierSettings/vimla_se.pb
 product/etc/CarrierSettings/vinaphone_vn.pb
 product/etc/CarrierSettings/virgin_ca.pb
@@ -311,6 +422,8 @@ product/etc/CarrierSettings/virgintelco_es.pb
 product/etc/CarrierSettings/visible_us.pb
 product/etc/CarrierSettings/visiblev_us.pb
 product/etc/CarrierSettings/viti_pf.pb
+product/etc/CarrierSettings/vivacom_bg.pb
+product/etc/CarrierSettings/vivo_br.pb
 product/etc/CarrierSettings/vodafone_au.pb
 product/etc/CarrierSettings/vodafone_cz.pb
 product/etc/CarrierSettings/vodafone_de.pb
@@ -320,6 +433,7 @@ product/etc/CarrierSettings/vodafone_gr.pb
 product/etc/CarrierSettings/vodafone_hu.pb
 product/etc/CarrierSettings/vodafone_ie.pb
 product/etc/CarrierSettings/vodafone_in.pb
+product/etc/CarrierSettings/vodafone_is.pb
 product/etc/CarrierSettings/vodafone_it.pb
 product/etc/CarrierSettings/vodafone_nl.pb
 product/etc/CarrierSettings/vodafone_nz.pb
@@ -328,16 +442,22 @@ product/etc/CarrierSettings/vodafone_pt.pb
 product/etc/CarrierSettings/vodafone_qa.pb
 product/etc/CarrierSettings/vodafone_ro.pb
 product/etc/CarrierSettings/vodafone_tr.pb
+product/etc/CarrierSettings/walmart_mx.pb
 product/etc/CarrierSettings/webbing_hk.pb
+product/etc/CarrierSettings/wim_mx.pb
 product/etc/CarrierSettings/windtre_it.pb
+product/etc/CarrierSettings/wom_cl.pb
 product/etc/CarrierSettings/xfinity2_us.pb
 product/etc/CarrierSettings/xfinity_us.pb
+product/etc/CarrierSettings/xfinitymso_us.pb
 product/etc/CarrierSettings/yes_my.pb
 product/etc/CarrierSettings/yesss_at.pb
 product/etc/CarrierSettings/yettel_bg.pb
 product/etc/CarrierSettings/yettel_hu.pb
 product/etc/CarrierSettings/yoigo_es.pb
+product/etc/CarrierSettings/yomobile_mx.pb
 product/etc/CarrierSettings/zain_bh.pb
 product/etc/CarrierSettings/zain_kw.pb
 product/etc/CarrierSettings/zain_sa.pb
 product/etc/CarrierSettings/zeop_re.pb
+product/etc/CarrierSettings/ztar_us.pb
--- a/felix/proprietary-files-vendor.txt
+++ b/felix/proprietary-files-vendor.txt
--- a/felix/proprietary-files.txt
+++ b/felix/proprietary-files.txt
@@ -3,8 +3,8 @@
 # product partition

 # AiAi
-product/priv-app/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore.apk;PRESIGNED
-product/priv-app/DevicePersonalizationPrebuiltPixel2022-v.U.14.playstore/DevicePersonalizationPrebuiltPixel2022-v.U.14.playstore.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2022-bfinal_aiai_20250217.00_RC08/DevicePersonalizationPrebuiltPixel2022-bfinal_aiai_20250217.00_RC08.apk;PRESIGNED

 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -20,6 +20,11 @@ product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIG
 product/etc/permissions/androidx.camera.extensions.impl.xml
 product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED

+# Camera services
+product/etc/permissions/com.google.pixel.camera.connectivity.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.cameraidremapper.impl.xml
+product/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.impl.xml
+
 # Felica
 product/etc/felica/common.cfg
 product/etc/felica/mfm.cfg
@@ -62,7 +67,7 @@ product/lib/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmengin
 product/lib/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm/libdmjavaplugin.so
 product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so
 product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so
-product/priv-app/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
+product/priv-app/CarrierSettings_signed_53.0.733201674/CarrierSettings_signed_53.0.733201674.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -91,15 +96,26 @@ system_ext/etc/permissions/com.google.android.camerax.extensions.xml
 system_ext/framework/com.google.android.camera.extensions.jar
 system_ext/framework/com.google.android.camerax.extensions.jar

+# Camera services
+system_ext/app/PersistentBackgroundCameraServices/PersistentBackgroundCameraServices.apk
+system_ext/etc/permissions/com.google.pixel.camera.connectivity.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.cameraidremapper.xml
+system_ext/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.xml
+system_ext/etc/vintf/manifest/com.google.pixel.camera.services@1.0-service-google.xml
+system_ext/framework/com.google.pixel.camera.connectivity.jar
+system_ext/framework/com.google.pixel.camera.services.cameraidremapper.jar
+system_ext/framework/com.google.pixel.camera.services.lyricconfigprovider.jar
+
 # Edge TPU
 system_ext/bin/hw/vendor.google.edgetpu_app_service@1.0-service
 system_ext/etc/init/vendor.google.edgetpu_app_service@1.0-service.rc
 system_ext/etc/public.libraries-google.txt
 system_ext/etc/vintf/manifest/vendor.google.edgetpu_app_service@1.0-service.xml
-system_ext/lib/libedgetpu_dba.google.so
 system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so
 system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so
-system_ext/lib64/libedgetpu_dba.google.so
+
+# Fold extensions
+system_ext/framework/felix-services.jar

 # HBM
 system_ext/lib64/libhbmsvmanager_jni.so;SYMLINK=system_ext/priv-app/HbmSVManager/lib/arm64/libhbmsvmanager_jni.so
@@ -133,6 +149,11 @@ system_ext/framework/google-ril.jar
 system_ext/priv-app/CarrierSetup/CarrierSetup.apk;PRESIGNED
 system_ext/priv-app/ConnectivityThermalPowerManager/ConnectivityThermalPowerManager.apk
 system_ext/priv-app/EuiccGoogleOverlay/EuiccGoogleOverlay.apk
+system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_DVT.in
+system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_DVT.up
+system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_EVT.in
+system_ext/priv-app/EuiccSupportPixel/DKA_0105_P22_EVT.up
+system_ext/priv-app/EuiccSupportPixel/DKA_0109_P22_DVT.up
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_DVT.in
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_DVT.up
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_EVT.up
@@ -142,6 +163,7 @@ system_ext/priv-app/EuiccSupportPixel/DKA_RC7_P22_EVT.in
 system_ext/priv-app/EuiccSupportPixel/DKA_RC7_P22_EVT.up
 system_ext/priv-app/EuiccSupportPixel/EuiccSupportPixel.apk;PRESIGNED
 system_ext/priv-app/EuiccSupportPixel/esim-full-ofl-v1.img
+system_ext/priv-app/EuiccSupportPixel/esim-full-v0-security.img
 system_ext/priv-app/EuiccSupportPixel/esim-full-v0.img
 system_ext/priv-app/EuiccSupportPixel/esim-full-v1.img
 system_ext/priv-app/EuiccSupportPixelPermissions/EuiccSupportPixelPermissions.apk;PRESIGNED
--- a/felix/proprietary-firmware.txt
+++ b/felix/proprietary-firmware.txt
--- a/felix/radio/felix_display_secondary_mipi_coex_table.csv
+++ b/felix/radio/felix_display_secondary_mipi_coex_table.csv
@@ -1,7 +1,7 @@
-730000,670000
+365000,335000

-1810000,1835000,670000
-720000,740000,670000
-0,710000,730000
-750000,1800000,730000
-1845000,50000000,730000
+1810000,1835000,335000
+720000,740000,335000
+0,710000,365000
+750000,1800000,365000
+1845000,50000000,365000
--- a/felix/setup-makefiles.py
+++ b/felix/setup-makefiles.py
@@ -0,0 +1 @@
+#!./extract-files.py --regenerate_makefiles
--- a/felix/skip-files-vendor.txt
+++ b/felix/skip-files-vendor.txt
--- a/felix/vendor.prop
+++ b/felix/vendor.prop
@@ -9,8 +9,5 @@ persist.vendor.ril.use_radio_hal=2.0
 ro.vendor.config.build_carrier=europen
 vendor.rild.libpath=libsitril.so

-# SSR
-vendor.debug.ssrdump.type=sscoredump
-
 # UWB
 ro.vendor.uwb.calibration.calibrationpaths=/vendor/etc/uwb/calib_paths
--- a/fingerprint_config.mk
+++ b/fingerprint_config.mk
@@ -1,11 +1,5 @@
-# Factory build, use HIDL hal & extension so that we can use Test tool
-ifneq ( ,$(findstring factory, $(TARGET_PRODUCT)))
-GOOGLE_CONFIG_FP_STATUS=1
-FPC_CONFIG_TRUSTY_CLEAN_TA=1
-else
 # Non factory build, use fingerprint AIDL version
 GOOGLE_CONFIG_POWER_NODE=/dev/input/event2
 GOOGLE_CONFIG_DP_COUNT=2
 GOOGLE_CONFIG_FP_STATUS=1
 GOOGLE_CONFIG_TOUCH_TO_UNLOCK_ANYTIME=1
-endif
--- a/init.insmod.felix.cfg
+++ b/init.insmod.felix.cfg
@@ -1,19 +0,0 @@
-#######################################################
-#           init.insmod.felix.cfg                     #
-# This file contains felix specific kernel modules to #
-# load at init time by init.insmod.sh script          #
-#######################################################
-
-# Load device specific kernel modules
-# Modules here will be loaded *after* all common modules
-modprobe|bcmdhd4389.ko
-modprobe|snd-soc-cs35l41-i2c.ko
-modprobe|fst2.ko
-modprobe|ftm5.ko
-modprobe|cs40l26-i2c.ko
-modprobe|snd-soc-cs40l26.ko
-
-# All device specific modules loaded
-setprop|vendor.device.modules.ready
-setprop|vendor.all.modules.ready
-setprop|vendor.all.devices.ready
--- a/lineage_felix.mk
+++ b/lineage_felix.mk
@@ -1,33 +1,35 @@
 #
-# Copyright (C) 2023 The LineageOS Project
-#
+# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
+# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
 # SPDX-License-Identifier: Apache-2.0
 #

-# Inherit some common Evolution X stuff.
+# Inherit some common Evolution X stuff
 TARGET_DISABLE_EPPE := true
 $(call inherit-product, vendor/lineage/config/common_full_foldable_book_telephony.mk)

 # Inherit device configuration
-$(call inherit-product, device/google/felix/aosp_felix.mk)
+DEVICE_CODENAME := felix
+DEVICE_PATH := device/google/felix
+VENDOR_PATH := vendor/google/felix
+$(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/gs201/lineage_common.mk)
 $(call inherit-product, device/google/gs201/evolution_common.mk)
-$(call inherit-product, device/google/felix/device-lineage.mk)
-$(call inherit-product, device/google/felix/device-evolution.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk)
+$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk)

 # Device identifier. This must come after all inclusions
 PRODUCT_BRAND := google
 PRODUCT_MODEL := Pixel Fold
-PRODUCT_NAME := lineage_felix
+PRODUCT_NAME := lineage_$(DEVICE_CODENAME)

 # Boot animation
 TARGET_SCREEN_HEIGHT := 2092
 TARGET_SCREEN_WIDTH := 1080

 PRODUCT_BUILD_PROP_OVERRIDES += \
-    TARGET_PRODUCT=felix \
-    PRIVATE_BUILD_DESC="felix-user 14 AP2A.240905.003 12231197 release-keys"
+    BuildDesc="felix-user 16 BP2A.250805.005 13691446 release-keys" \
+    BuildFingerprint=google/felix/felix:16/BP2A.250805.005/13691446:user/release-keys \
+    DeviceProduct=$(DEVICE_CODENAME)

-BUILD_FINGERPRINT := google/felix/felix:14/AP2A.240905.003/12231197:user/release-keys
-
-$(call inherit-product, vendor/google/felix/felix-vendor.mk)
+$(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
--- a/location/gps_user.6.1.xml.f10
+++ b/location/gps_user.6.1.xml.f10
@@ -5,20 +5,19 @@
       BaudRate="921600"
       GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
       CustGpioDelayMs="250"
-       LogEnabled="true"
+       LogEnabled="false"
       Log="JAVA"
-       SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
       LogDirectory="/sdcard/gps/broadcom/storage/"
       CtrlPipe="/data/vendor/gps/glgpsctrl"
       NmeaOutName="/data/vendor/gps/nmea_out"

       acSuplServer="supl.google.com"
       SuplPort="7275"
-       SuplLogEnable="true"
+       SuplLogEnable="false"
       SuplLogFullName="/data/vendor/gps/suplflow.txt"
       tlsEnable="true"

-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
       SuplEnable="true"
       SuplUseApn="false"
       SuplUseApnNI="true"
@@ -35,7 +34,7 @@
       SuplVersion="2"
       SuplMinorVersion="0"
       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
       SuplGlonassCapable = "true"
       SuplGalileoCapable = "true"
       SuplBdsCapable = "true"
@@ -49,20 +48,24 @@
       LtoSyncThresholdDays="1"

       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
       CpGuardTimeSec="1"
       CpLppGuardTimeSec="1"
       IgnoreInjectedSystemTime="true"

       AttributionAppPkgName="com.google.android.carrierlocation"

-       AssertEnabled="true"
+       AssertEnabled="false"
       CpLppeCancelDbhOnAgnssProvideLoc="true"
       CpLppeUseAgnssLocForEmptyDbh="true"
       CpLppHighAccuracyShapeMode="1"
+       CpLppDisableUEAInLTE="true"
+       CpLppGalileoCapable="true"
+       CpLppGalileoIE="true"
       ReAidingOnHotStart="false"
       ReAidingIntervalSec="3600"
       RuntimeSwLteFilterEnable="true"
-       PpsDevice="/sys/class/pps/pps0/assert_elapsed"
+       PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
       SensorsMask="0x244"
       MaxThreadNum="13"
  />
@@ -70,7 +73,7 @@
  <gll
       PpsEnable="true"
       LogPriMask="LOG_INFO"
-       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI"
+       LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
       FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
       MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
       MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
@@ -88,7 +91,7 @@
       RfPathLossDb_Cp_L5="3.7"
       OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"

-       EnableOnChipStopNotification="2"
+       EnableOnChipStopNotification="0"
       PowerMode="3"
       MinGpsWeekNumber="2216"
       OnChipAccMask="50"
--- a/location/gps_user.xml.f10
+++ b/location/gps_user.xml.f10
@@ -17,7 +17,7 @@
       SuplLogFullName="/data/vendor/gps/suplflow.txt"
       tlsEnable="true"

-       SuplSslMethod="SSLv23_NO_TLSv1_2"
+       SuplSslMethod="SSLv23"
       SuplEnable="true"
       SuplUseApn="false"
       SuplUseApnNI="true"
@@ -34,7 +34,7 @@
       SuplVersion="2"
       SuplMinorVersion="0"
       SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="false"
+       SuplOtdoaCapable2="true"
       SuplGlonassCapable = "true"
       SuplGalileoCapable = "true"
       SuplBdsCapable = "true"
@@ -48,6 +48,7 @@
       LtoSyncThresholdDays="1"

       GnssYearOfHardware="2020"
+       CpEarlyFixGuardTimeSec="1"
       CpGuardTimeSec="1"
       CpLppGuardTimeSec="1"
       IgnoreInjectedSystemTime="true"
@@ -99,6 +100,7 @@
  <gll_features
       EnableNicAutoSwitch="true"
       EnableNavic="true"
+       ConstellationAutoSwitchOffNavOnly="true"
  />

 </glgps>
--- a/location/lhd.conf.f10
+++ b/location/lhd.conf.f10
@@ -1,34 +0,0 @@
-LheName=bbd
-
-LheRsmResetTimeoutMS=10000
-GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby
-
-LhePatch=/vendor/firmware/SensorHub.patch
-Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
-LheConsole=/data/vendor/gps/LheConsole
-
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-
-LheBbdPacket=/dev/ttyBCM
-
-LheBbdControl=/dev/bbd_control
-
-# LheBbdSensor=/dev/bbd_sensor
-
-LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt
-LogLevel=*:I
-
-NvStorageDir=/data/vendor/gps/
-
-# Enable BBD debugging at these stages:
-# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD
-
-LheAutoBaudDelayMS=10
-TrafficLogEnabled=false
-SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf
-
-SkipSensorWakeLock=true
-LoggerWakeLockEnable=false
-PpsEnable=true
--- a/location/scd.conf.f10
+++ b/location/scd.conf.f10
@@ -1,6 +0,0 @@
-LogEnabled=true
-Log=JAVA
-LogDirectory=/sdcard/gps/broadcom/storage
-NvStorageDir=/data/vendor/gps/
-TcpConnectionTimeout=20
-SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,133 +0,0 @@
-<manifest version="1.0" type="device" target-level="5">
-   <hal format="hidl">
-        <name>android.hardware.audio</name>
-        <transport>hwbinder</transport>
-        <version>7.1</version>
-        <interface>
-            <name>IDevicesFactory</name>
-            <instance>default</instance>
-        </interface>
-   </hal>
-   <hal format="hidl">
-        <name>android.hardware.audio.effect</name>
-        <transport>hwbinder</transport>
-        <version>7.0</version>
-        <interface>
-            <name>IEffectsFactory</name>
-            <instance>default</instance>
-        </interface>
-   </hal>
-   <hal format="hidl">
-        <name>android.hardware.soundtrigger</name>
-        <transport>hwbinder</transport>
-        <version>2.3</version>
-        <interface>
-            <name>ISoundTriggerHw</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.media.omx</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IOmx</name>
-            <instance>default</instance>
-        </interface>
-        <interface>
-            <name>IOmxStore</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.allocator</name>
-        <transport>hwbinder</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IAllocator</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.mapper</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>4.0</version>
-        <interface>
-            <name>IMapper</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.graphics.composer</name>
-        <transport>hwbinder</transport>
-        <version>2.4</version>
-        <interface>
-            <name>IComposer</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.renderscript</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format = "hidl">
-        <name>android.hardware.dumpstate</name>
-        <transport>hwbinder</transport>
-        <version>1.1</version>
-        <interface>
-            <name>IDumpstateDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.bluetooth.audio</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IBluetoothAudioProvidersFactory</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.boot</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::IBootControl/default</fqname>
-    </hal>
-    <hal format="hidl">
-       <name>android.hardware.neuralnetworks</name>
-       <transport>hwbinder</transport>
-       <fqname>@1.3::IDevice/google-edgetpu</fqname>
-    </hal>
-    <hal format="hidl">
-        <name>android.hardware.health</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <interface>
-            <name>IHealth</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="aidl">
-        <name>vendor.google.google_battery</name>
-        <version>3</version>
-        <interface>
-            <name>IGoogleBattery</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-    <hal format="hidl">
-       <name>vendor.google.whitechapel.audio.audioext</name>
-       <transport>hwbinder</transport>
-       <version>4.0</version>
-       <interface>
-           <name>IAudioExt</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
-    <kernel target-level="6"/>
-</manifest>
--- a/modules.blocklist.vendor_kernel_boot
+++ b/modules.blocklist.vendor_kernel_boot
@@ -0,0 +1,3 @@
+blocklist fst2.ko
+blocklist ftm5.ko
+blocklist goog_touch_interface.ko
--- a/modules.load.vendor_kernel_boot
+++ b/modules.load.vendor_kernel_boot
@@ -0,0 +1,3 @@
+extra/fst2.ko
+extra/ftm5.ko
+extra/goog_touch_interface.ko
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -135,7 +135,7 @@ OFFHOST_ROUTE_ESE={86}
 # host  0x00
 # eSE   0x82 (eSE),    0x86 (eUICC/SPI-SE)
 # UICC  0x81 (UICC_1), 0x85 (UICC_2)
-DEFAULT_ISODEP_ROUTE=0x81
+DEFAULT_ISODEP_ROUTE=0x00

 ###############################################################################
 # Configure the HAL Clock control
--- a/overlay-lineage/frameworks/base/core/res/res/values/config.xml
+++ b/overlay-lineage/frameworks/base/core/res/res/values/config.xml
@@ -49,11 +49,18 @@
     state. Default is empty. -->
    <integer-array name="config_rearDisplayDeviceStates">
        <item>3</item>
+        <item>5</item>
+    </integer-array>
+
+    <!-- The device states (supplied by DeviceStateManager) that should be treated as concurrent
+    display state. Default is empty. -->
+    <integer-array name="config_concurrentDisplayDeviceStates">
+        <item>4</item>
    </integer-array>

    <!-- Indicates whether the window manager reacts to half-fold device states by overriding
     rotation. -->
-    <bool name="config_windowManagerHalfFoldAutoRotateOverride">true</bool>
+    <bool name="config_windowManagerHalfFoldAutoRotateOverride">false</bool>

    <!-- Indicates whether the window manager pauses autorotation when folding or unfolding
     a foldable device based on hinge angle sensor events and physical display switch events. -->
@@ -93,26 +100,42 @@
        <item>0:1</item>
        <item>1:0:2</item>
        <item>2:2</item>
+        <item>3:0:0</item>
    </string-array>

+    <!-- Whether to show Fold lock behavior setting feature in Settings App -->
+    <bool name="config_fold_lock_behavior">true</bool>
+
    <!-- Device states where the sensor based rotation values should be reversed around the Z axis
         for the default display.
         TODO(b/265312193): Remove this workaround when this bug is fixed.-->
    <integer-array name="config_deviceStatesToReverseDefaultDisplayRotationAroundZAxis">
        <item>3</item>
+        <item>5</item>
    </integer-array>

+    <!-- Boolean indicating whether secondary built-in displays should have their orientation
+         match the active default display. This config assumes that the secondary display only
+         requires swapping ROTATION_90 and ROTATION_270.
+         TODO(b/265991392): This should eventually be configured and parsed in
+          display_settings.xml -->
+    <bool name="config_matchSecondaryInternalDisplaysOrientationToReverseDefaultDisplay">true</bool>
+
    <!-- The time in milliseconds after which a press on power button is considered "long". -->
    <integer name="config_longPressOnPowerDurationMs">750</integer>

-    <!-- Control whether the pickup gesture is enabled by default. This value will be used
-     during initialization when the setting is still null. -->
-    <bool name="config_dozePickupGestureEnabled">false</bool>
-
    <!-- Amount of time in ms the user needs to press the relevant key to bring up the
         global actions dialog -->
    <integer name="config_globalActionsKeyTimeout">750</integer>

+    <!-- The fixed keyboard vibration strength in [0,1], or -1 to indicate the strength not fixed
+         and should depend on the touch feedback intensity user setting -->
+    <item name="config_keyboardHapticFeedbackFixedAmplitude" type="dimen">1.0</item>
+
+    <!-- Class name of the device specific implementation of DeviceStatePolicy.Provider
+        or empty if the default should be used. -->
+    <string name="config_deviceSpecificDeviceStatePolicyProvider" translatable="false">com.google.android.server.policy.FelixDeviceStatePolicyProvider</string>
+
    <!-- Indicates whether device has a power button fingerprint sensor. -->
    <bool name="config_is_powerbutton_fps">true</bool>

@@ -125,11 +148,13 @@

    <!-- Map of System DeviceState supplied by DeviceStateManager to WM Jetpack posture. Must be in
         the format [System DeviceState]:[WM Jetpack Posture], for example: "0:1". -->
-    <string-array name="config_device_state_postures">
+    <string-array name="config_device_state_postures" translatable="false">
        <item>0:1</item>
        <item>1:2</item>
        <item>2:3</item>
        <item>3:1</item>
+        <item>4:1000</item>
+        <item>5:1</item>
    </string-array>

    <!-- Which Surface rotations are considered as tabletop posture (horizontal hinge) when the
@@ -152,7 +177,7 @@
         Note: Activity min/max aspect ratio restrictions will still be respected.
         Therefore this override can control the maximum screen area that can be occupied by
         the app in the letterbox mode. -->
-    <item type="dimen" name="config_fixedOrientationLetterboxAspectRatio">1.333</item>
+    <item name="config_fixedOrientationLetterboxAspectRatio" type="dimen">1.333</item>

    <!-- Corners radius for activity presented the letterbox mode. Values < 0 enable rounded
         corners with radius equal to min between device bottom corner radii. Default 0 value turns
@@ -163,7 +188,7 @@
        0 corresponds to the upper side of the screen and 1 to the lower side. If given value < 0
        or > 1 it is ignored and for non-tabletop mode central position is used (0.5); for
         tabletop mode top (0.0) is used. -->
-    <item type="dimen" name="config_letterboxVerticalPositionMultiplier">0.5</item>
+    <item name="config_letterboxVerticalPositionMultiplier" type="dimen">0.5</item>

    <!-- Whether horizontal reachability repositioning is allowed for letterboxed fullscreen apps.
    -->
@@ -186,10 +211,20 @@
    <!-- Whether using display aspect ratio as a default aspect ratio for all letterboxed apps. -->
    <bool name="config_letterboxIsDisplayAspectRatioForFixedOrientationLetterboxEnabled">true</bool>

+    <!-- Whether should use split screen aspect ratio for the activity when camera compat treatment
+        is enabled and activity is connected to the camera in fullscreen. -->
+    <bool name="config_isWindowManagerCameraCompatSplitScreenAspectRatioEnabled">true</bool>
+
    <!-- Whether the specific behaviour for translucent activities letterboxing is enabled.
         TODO(b/255532890) Enable when ignoreOrientationRequest is set -->
    <bool name="config_letterboxIsEnabledForTranslucentActivities">true</bool>

+    <!-- Whether per-app user aspect ratio override settings is enabled -->
+    <bool name="config_appCompatUserAppAspectRatioSettingsIsEnabled">true</bool>
+
+    <!-- Whether per-app fullscreen override option is allowed in user aspect ratio settings -->
+    <bool name="config_appCompatUserAppAspectRatioFullscreenIsEnabled">true</bool>
+
    <!-- Whether sending compat fake focus for split screen resumed activities is enabled.
         Needed because some game engines wait to get focus before drawing the content of
         the app which isn't guaranteed by default in multi-window modes. -->
@@ -201,17 +236,10 @@
        split screen. -->
    <bool name="config_isWindowManagerCameraCompatTreatmentEnabled">true</bool>

-    <!-- Whether should use split screen aspect ratio for the activity when camera compat treatment
-        is enabled and activity is connected to the camera in fullscreen. -->
-    <bool name="config_isWindowManagerCameraCompatSplitScreenAspectRatioEnabled">true</bool>
-
-    <!-- Whether a camera compat controller is enabled to allow the user to apply or revert
-         treatment for stretched issues in camera viewfinder. -->
-    <bool name="config_isCameraCompatControlForStretchedIssuesEnabled">true</bool>
-
    <!-- List of the labels of requestable device state config values -->
    <string-array name="config_deviceStatesAvailableForAppRequests">
        <item>config_deviceStateRearDisplay</item>
+        <item>config_deviceStateConcurrentRearDisplay</item>
    </string-array>

    <!-- Device state that corresponds to rear display mode, feature provided
@@ -220,12 +248,15 @@
    -->
    <integer name="config_deviceStateRearDisplay">3</integer>

-    <!-- Whether the vendor power press code need to be mapped. -->
-    <bool name="config_powerPressMapping">true</bool>
+    <!-- Device state that corresponds to concurrent display mode where the default display
+         is the internal display. Public API for the feature is provided through Jetpack
+         WindowManager.
+         TODO(b/236022708) Move concurrent display state to device state config file
+    -->
+    <integer name="config_deviceStateConcurrentRearDisplay">4</integer>

-    <!-- Power press vendor code. -->
-    <integer name="config_powerPressCode">19</integer>
-
-    <!-- IWLAN-->
-    <string name="config_qualified_networks_service_package">com.android.qns</string>
+    <!-- Physical display address that corresponds to the rear display in rear display mode
+         and concurrent display mode. Used to get information about the display before
+         entering the corresponding modes -->
+    <string name="config_rearDisplayPhysicalAddress" translatable="false">4619827677550801153</string>
 </resources>
--- a/overlay-lineage/frameworks/base/core/res/res/values/config_telephony.xml
+++ b/overlay-lineage/frameworks/base/core/res/res/values/config_telephony.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Indicating whether the retry timer from setup data call response for data throttling should
+         be honored for emergency network request. By default this is off, meaning for emergency
+         network requests, the data frameworks will ignore the previous retry timer passed in from
+         setup data call response. -->
+    <bool name="config_honor_data_retry_timer_for_emergency_network">true</bool>
+
+    <!-- Telephony qualified networks service package name to bind to by default. -->
+    <string name="config_qualified_networks_service_package" translatable="false">com.android.qns</string>
+</resources>
--- a/overlay-lineage/frameworks/base/libs/WindowManager/Shell/res/values/config.xml
+++ b/overlay-lineage/frameworks/base/libs/WindowManager/Shell/res/values/config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Whether the extended restart dialog is enabled -->
+    <bool name="config_letterboxIsRestartDialogEnabled">true</bool>
+
+    <!-- Whether the additional education about reachability is enabled -->
+    <bool name="config_letterboxIsReachabilityEducationEnabled">true</bool>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay-lineage/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright (c) 2009, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources>
+    <bool name="def_accelerometer_rotation">true</bool>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/raw/rear_display_folded.json
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/raw/rear_display_folded.json
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/raw/rear_display_turnaround.json
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/raw/rear_display_turnaround.json
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw720dp-land/config.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw720dp-land/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- The number of columns in the QuickSettings -->
+    <integer name="quick_settings_num_columns">2</integer>
+</resources>
--- a/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_folded_bottom_right.json
+++ b/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_folded_bottom_right.json
--- a/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_folded_top_left.json
+++ b/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_folded_top_left.json
--- a/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_folded_top_right.json
+++ b/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_folded_top_right.json
--- a/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_landscape_top_right.json
+++ b/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_landscape_top_right.json
--- a/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_portrait_bottom_right.json
+++ b/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_portrait_bottom_right.json
--- a/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_portrait_top_left.json
+++ b/overlay-lineage/packages/apps/Settings/res/raw/fingerprint_edu_lottie_portrait_top_left.json
--- a/overlay-lineage/packages/apps/Settings/res/values-af/strings.xml
+++ b/overlay-lineage/packages/apps/Settings/res/values-af/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="setting_auto_rotate_folded">Outodraai wanneer dit toegevou is</string>
+    <string name="setting_auto_rotate_folded">Outodraai wanneer dit gevou is</string>
    <string name="setting_auto_rotate_unfolded">Outodraai wanneer dit oopgevou is</string>
 </resources>
--- a/overlay-lineage/packages/apps/Settings/res/values-ar-rXB/strings.xml
+++ b/overlay-lineage/packages/apps/Settings/res/values-ar-rXB/strings.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="setting_auto_rotate_folded">‏‮Auto-rotate‬‏ ‏‮when‬‏ ‏‮folded‬‏</string>
-    <string name="setting_auto_rotate_unfolded">‏‮Auto-rotate‬‏ ‏‮when‬‏ ‏‮unfolded‬‏</string>
-</resources>
--- a/overlay-lineage/packages/apps/Settings/res/values-ne/strings.xml
+++ b/overlay-lineage/packages/apps/Settings/res/values-ne/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="setting_auto_rotate_folded">फोल्ड गरिएका बेला स्वतः रोटेट गरियोस्</string>
-    <string name="setting_auto_rotate_unfolded">अनफोल्ड गरिएका बेला स्वतः रोटेट गरियोस्</string>
+    <string name="setting_auto_rotate_folded">फोल्ड गरिएका बेला स्वतः रोटेट गर्नुहोस्</string>
+    <string name="setting_auto_rotate_unfolded">अनफोल्ड गरिएका बेला स्वतः रोटेट गर्नुहोस्</string>
 </resources>
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ b/overlay-lineage/packages/apps/Settings/res/values/config.xml
@@ -18,6 +18,23 @@
    <!-- Whether to show Smooth Display feature in Settings Options -->
    <bool name="config_show_smooth_display">true</bool>

+    <!-- App aspect ratio settings screen, user aspect ratio override options. Must be the same
+         length and order as config_userAspectRatioOverrideValues below. -->
+    <string-array name="config_userAspectRatioOverrideEntries" translatable="false">
+        <item>@null</item>
+        <item>@null</item>
+        <item>@null</item>
+    </string-array>
+
+    <!-- App aspect ratio settings screen, user aspect ratio override options. Must be the same
+         length and order as config_userAspectRatioOverrideEntries above. The values must
+         correspond to PackageManager.UserMinAspectRatio -->
+    <integer-array name="config_userAspectRatioOverrideValues" translatable="false">
+        <item>0</item> <!-- USER_MIN_ASPECT_RATIO_UNSET -->
+        <item>6</item> <!-- USER_MIN_ASPECT_RATIO_FULLSCREEN -->
+        <item>1</item> <!-- USER_MIN_ASPECT_RATIO_SPLIT_SCREEN -->
+    </integer-array>
+
    <!-- The settings/preference description for each settable device state defined in the array
         "config_perDeviceStateRotationLockDefaults".
         The item in position "i" describes the auto-rotation setting for the device state also in
@@ -26,8 +43,9 @@
        <item>@string/setting_auto_rotate_folded</item>
        <item>@null</item>
        <item>@string/setting_auto_rotate_unfolded</item>
+        <item>@null</item>
    </string-array>

    <!-- The ratio to use when using the two-pane settings layout -->
-    <item name="config_activity_embed_split_ratio" format="float" type="dimen">0.5</item>
+    <item name="config_activity_embed_split_ratio" type="dimen">0.5</item>
 </resources>
--- a/powerhint.json
+++ b/powerhint.json
@@ -21,7 +21,8 @@
        "1539000",
        "1352000",
        "1014000",
-        "421000"
+        "421000",
+        "546000"
      ],
      "ResetOnInit": true
    },
@@ -193,6 +194,54 @@
      ],
      "ResetOnInit": true
    },
+    {
+      "Name": "TAUclampMinOnNiceEnable",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_enable",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value",
+      "Values": [
+        "765",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidValue",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value",
+      "Values": [
+        "600",
+        "590",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceHighPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio",
+      "Values": [
+        "110",
+        "119",
+        "120"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAUclampMinOnNiceMidPrio",
+      "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio",
+      "Values": [
+        "128",
+        "139",
+        "130"
+      ],
+      "ResetOnInit": true
+    },
    {
      "Name": "FGUClampBoost",
      "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
@@ -285,6 +334,35 @@
      ],
      "ResetOnInit": true
    },
+    {
+      "Name": "TAAutoPreferFit",
+      "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAPreferredIdleMaskMid",
+      "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_mid",
+      "Values": [
+        "0x3f",
+        "0xf0",
+        "0xff"
+      ],
+      "ResetOnInit": true
+    },
+    {
+      "Name": "TAPreferredIdleMaskLow",
+      "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_low",
+      "Values": [
+        "0x3f",
+        "0xf0",
+        "0xff"
+      ],
+      "ResetOnInit": true
+    },
    {
      "Name": "FGPreferIdle",
      "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
@@ -313,14 +391,6 @@
      ],
      "ResetOnInit": true
    },
-    {
-      "Name": "NewlyIdleBalancer",
-      "Path": "/proc/vendor_sched/idle_balancer",
-      "Values": [
-        "0",
-        "1"
-      ]
-    },
    {
      "Name": "DisplayWakeup",
      "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup",
@@ -687,6 +757,26 @@
      ],
      "DefaultIndex": 0,
      "ResetOnInit": true
+    },
+    {
+      "Name": "AAModeProperty",
+      "Path": "vendor.powerhal.mode.aa",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true,
+      "Type": "Property"
+    },
+    {
+      "Name": "SYSTEM_UI_ADPF_PROFILES",
+      "Path": "<AdpfConfig>:SYSTEM_UI",
+      "Values": [
+        "SYSTEM_UI_PROFILE"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true,
+      "Type": "Event"
    }
  ],
  "Actions": [
@@ -779,6 +869,54 @@
      "Duration": 5000,
      "Value": "0"
    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAAutoPreferFit",
+      "Duration": 5000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAPreferredIdleMaskMid",
+      "Duration": 5000,
+      "Value": "0x3f"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAPreferredIdleMaskLow",
+      "Duration": 5000,
+      "Value": "0x3f"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceEnable",
+      "Duration": 5000,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceHighValue",
+       "Duration": 5000,
+       "Value": "765"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceHighPrio",
+      "Duration": 5000,
+      "Value": "110"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceMidValue",
+       "Duration": 5000,
+       "Value": "590"
+    },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUclampMinOnNiceMidPrio",
+      "Duration": 5000,
+      "Value": "139"
+    },
    {
      "PowerHint": "LAUNCH",
      "Type": "DoHint",
@@ -878,6 +1016,12 @@
      "Duration": 5000,
      "Value": "0"
    },
+    {
+      "PowerHint": "DISPLAY_INACTIVE",
+      "Node": "MemFreq",
+      "Duration": 0,
+      "Value": "421000"
+    },
    {
      "PowerHint": "CPU_LOAD_RESET",
      "Node": "GPUMinFreq",
@@ -890,6 +1034,12 @@
      "Duration": 33,
      "Value": "1014000"
    },
+    {
+      "PowerHint": "CPU_LOAD_RESET",
+      "Node": "TAPreferHighCap",
+      "Duration": 33,
+      "Value": "1"
+    },
    {
      "PowerHint": "CAMERA_LAUNCH",
      "Node": "MemFreq",
@@ -1100,6 +1250,18 @@
      "Duration": 100,
      "Value": "0"
    },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "CDPreferIdle",
+      "Duration": 100,
+      "Value": "1"
+    },
+    {
+      "PowerHint": "CAMERA_MULTICAM_BOOST",
+      "Node": "PMU_POLL",
+      "Duration": 100,
+      "Value": "0"
+    },
    {
      "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1",
      "Node": "TAPreferHighCap",
@@ -1358,12 +1520,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_EXTREME",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_HIGH",
      "Node": "PMU_POLL",
@@ -1478,12 +1634,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_HIGH",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_STANDARD",
      "Node": "PowerHALCameraRunning",
@@ -1580,12 +1730,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_STREAMING_LOW",
      "Node": "PowerHALCameraRunning",
@@ -1646,12 +1790,6 @@
      "Duration": 0,
      "Value": "0"
    },
-    {
-      "PowerHint": "CAMERA_STREAMING_LOW",
-      "Node": "NewlyIdleBalancer",
-      "Duration": 0,
-      "Value": "0"
-    },
    {
      "PowerHint": "CAMERA_MULTI_CAM_STREAMING",
      "Node": "CPUBigClusterMaxFreq",
@@ -1936,6 +2074,12 @@
      "Duration": 0,
      "Value": "1"
    },
+    {
+      "PowerHint": "AUTOMOTIVE_PROJECTION",
+      "Node": "AAModeProperty",
+      "Duration": 0,
+      "Value": "1"
+    },
    {
      "PowerHint": "DISPLAY_IDLE",
      "Node": "FGPreferIdle",
@@ -1953,24 +2097,24 @@
      "Type": "EndHint",
      "Value": "DISPLAY_UPDATE_IMMINENT"
    },
+    {
+      "PowerHint": "DISPLAY_IDLE",
+      "Type": "MaskHint",
+      "Value":"DISPLAY_UPDATE_IMMINENT",
+      "EnableProperty": "vendor.powerhal.mode.aa"
+    },
+    {
+      "PowerHint": "DISPLAY_IDLE",
+      "Type": "MaskHint",
+      "Value":"CPU_LOAD_RESET",
+      "EnableProperty": "vendor.powerhal.mode.aa"
+    },
    {
      "PowerHint": "DISPLAY_UPDATE_IMMINENT",
      "Node": "DisplayWakeup",
      "Duration": 50,
      "Value": "1"
    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "100"
-    },
-    {
-      "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
-      "Node": "LimitFlashCurrent",
-      "Duration": 0,
-      "Value": "1500"
-    },
    {
      "PowerHint": "EXPENSIVE_RENDERING",
      "Node": "PowerHALRenderingState",
@@ -2112,25 +2256,19 @@
    {
      "PowerHint": "FACE_UNLOCK_BOOST",
      "Node": "CPUBigClusterMaxFreq",
-      "Duration": 1000,
+      "Duration": 500,
      "Value": "9999999"
    },
    {
      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_LITTLE_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "FACE_UNLOCK_BOOST",
-      "Node": "CPU_MID_TSKIN_BYPASS",
-      "Duration": 1000,
-      "Value": "1"
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 500,
+      "Value": "1826000"
    },
    {
      "PowerHint": "FACE_UNLOCK_BOOST",
      "Node": "CPU_BIG_TSKIN_BYPASS",
-      "Duration": 1000,
+      "Duration": 500,
      "Value": "1"
    },
    {
@@ -2202,16 +2340,28 @@
      "PID_Du": 0.0,
      "UclampMin_On": true,
      "UclampMin_Init": 232,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
      "ReportingRateLimitNs": 83333330,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_90FPS",
@@ -2226,16 +2376,28 @@
      "PID_Du": 0.0,
      "UclampMin_On": true,
      "UclampMin_Init": 162,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
      "ReportingRateLimitNs": 111111110,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
      "Name": "REFRESH_60FPS",
@@ -2250,88 +2412,64 @@
      "PID_Du": 0.0,
      "UclampMin_On": true,
      "UclampMin_Init": 162,
+      "UclampMin_LoadUp": 480,
+      "UclampMin_LoadReset": 480,
      "UclampMin_High": 480,
      "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
      "SamplingWindow_P": 1,
      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
      "ReportingRateLimitNs": 166666660,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 15.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    },
    {
-      "Name": "UiHighBoostWithoutPid",
-      "PID_On": false,
-      "PID_Po": 0,
-      "PID_Pu": 0,
-      "PID_I": 0,
-      "PID_I_Init": 0,
-      "PID_I_High": 0,
-      "PID_I_Low": 0,
-      "PID_Do": 0,
-      "PID_Du": 0,
-      "SamplingWindow_P": 1,
-      "SamplingWindow_I": 1,
-      "SamplingWindow_D": 1,
+      "Name": "SYSTEM_UI_PROFILE",
+      "PID_On": true,
+      "PID_Po": 2.0,
+      "PID_Pu": 1.0,
+      "PID_I": 0.0,
+      "PID_I_Init": 200,
+      "PID_I_High": 512,
+      "PID_I_Low": -30,
+      "PID_Do": 500.0,
+      "PID_Du": 0.0,
      "UclampMin_On": true,
-      "UclampMin_Init": 250,
-      "UclampMin_High": 197,
-      "UclampMin_Low": 197,
-      "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
-      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0
-    },
-    {
-      "Name": "UiLowBoostWithoutPid",
-      "PID_On": false,
-      "PID_Po": 0,
-      "PID_Pu": 0,
-      "PID_I": 0,
-      "PID_I_Init": 0,
-      "PID_I_High": 0,
-      "PID_I_Low": 0,
-      "PID_Do": 0,
-      "PID_Du": 0,
+      "UclampMin_Init": 232,
+      "UclampMin_LoadUp": 730,
+      "UclampMin_LoadReset": 730,
+      "UclampMin_High": 480,
+      "UclampMin_Low": 2,
+      "UclampMax_EfficientBase": 500,
+      "UclampMax_EfficientOffset": 200,
      "SamplingWindow_P": 1,
-      "SamplingWindow_I": 1,
+      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
-      "UclampMin_On": true,
-      "UclampMin_Init": 250,
-      "UclampMin_High": 53,
-      "UclampMin_Low": 53,
-      "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
+      "ReportingRateLimitNs": 166666660,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0
-    },
-    {
-      "Name": "UiLowNoneBoost",
-      "PID_On": false,
-      "PID_Po": 0,
-      "PID_Pu": 0,
-      "PID_I": 0,
-      "PID_I_Init": 0,
-      "PID_I_High": 0,
-      "PID_I_Low": 0,
-      "PID_Do": 0,
-      "PID_Du": 0,
-      "SamplingWindow_P": 1,
-      "SamplingWindow_I": 1,
-      "SamplingWindow_D": 1,
-      "UclampMin_On": true,
-      "UclampMin_Init": 250,
-      "UclampMin_High": 0,
-      "UclampMin_Low": 0,
-      "ReportingRateLimitNs": 1,
-      "EarlyBoost_On": false,
-      "EarlyBoost_TimeFactor": 0.0,
-      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.5,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300
    }
  ]
 }
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
--- a/rro_overlays/NfcOverlay/OWNERS
+++ b/rro_overlays/NfcOverlay/OWNERS
@@ -1,2 +0,0 @@
-# Bug component: 48448
-include platform/packages/apps/Nfc:/OWNERS
--- a/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/rro_overlays/NfcOverlay/res/values/config.xml
@@ -29,8 +29,8 @@
    <item>30</item>
  </integer-array>
  <integer-array name="antenna_y">
-    <item>103</item>
-    <item>103</item>
+    <item>44</item>
+    <item>44</item>
  </integer-array>
  <bool name="nfc_observe_mode_supported">true</bool>
 </resources>
--- a/rro_overlays/UwbOverlay/OWNERS
+++ b/rro_overlays/UwbOverlay/OWNERS
@@ -1,3 +0,0 @@
-# People who can approve changes for submission
-include platform/packages/modules/Uwb:/OWNERS
-victorliu@google.com
--- a/rro_overlays/WifiOverlay/OWNERS
+++ b/rro_overlays/WifiOverlay/OWNERS
@@ -1,4 +0,0 @@
-# People who can approve changes for submission
-kumachang@google.com
-wangroger@google.com
-hsuvictor@google.com
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -169,4 +169,12 @@
         If equals to 0, it means there's no limit on the max number of channels to include per network.-->
    <integer translatable="false" name="config_wifiInitialPartialScanMaxNewChannelsPerNetwork">3</integer>

+    <!-- Boolean indicating whether to disable firmware roaming when the device goes into idle mode.
+         true: firmware roaming will be disabled when the device goes into idle mode, and then
+               re-activated when the device exits idle mode.
+         false: firmware roaming will not be affected. -->
+    <bool translatable="false" name ="config_wifiDisableFirmwareRoamingInIdleMode">true</bool>
+
+    <!-- Boolean indicating whether to trigger bugreport for WiFi subsystem restart issue -->
+    <bool translatable="false" name ="config_wifi_subsystem_restart_bugreport_enabled">false</bool>
 </resources>
--- a/self-extractors/METADATA
+++ b/self-extractors/METADATA
@@ -1,3 +0,0 @@
-third_party {
-  license_type: NOTICE
-}
--- a/self-extractors/PART1
+++ b/self-extractors/PART1
@@ -1,12 +0,0 @@
-#
-# Usage is subject to the enclosed license agreement
-
-echo
-echo The license for this software will now be displayed.
-echo You must agree to this license before using this software.
-echo
-echo -n Press Enter to view the license
-read dummy
-echo
-
-more << __EOF__
--- a/self-extractors/PART2
+++ b/self-extractors/PART2
@@ -1,22 +0,0 @@
-__EOF__
-
-if test $? != 0
-then
-  echo ERROR: Couldn\'t display license file 1>&2
-  exit 1
-fi
-
-echo
-
-echo -n Type \"I ACCEPT\" if you agree to the terms of the license:\ 
-read typed
-
-if test "$typed" != I\ ACCEPT
-then
-  echo
-  echo You didn\'t accept the license. Extraction aborted.
-  exit 2
-fi
-
-echo
-
--- a/self-extractors/PART3
+++ b/self-extractors/PART3
@@ -1,12 +0,0 @@
-
-if test $? != 0
-then
-  echo
-  echo ERROR: Couldn\'t extract files. 1>&2
-  exit 3
-else
-  echo
-  echo Files extracted successfully.
-fi
-exit 0
-
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`#!./extract-files.py --regenerate_makefiles`