comet: Initialize for Evolution X 11.x

Signed-off-by: AnierinB <anierin@evolution-x.org>
comet: Drop prebuilt kernel dependency
2025-09-26 05:03:29 +00:00 · 2025-08-28 16:18:00 +03:00 · 2025-08-13 02:22:24 +00:00 · 2025-07-30 17:42:11 +03:00 · 2025-07-09 16:02:41 +03:00 · 2025-06-26 08:45:32 +03:00
111 changed files with 1528 additions and 164254 deletions
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,8 +16,4 @@

 PRODUCT_MAKEFILES := \
    $(LOCAL_DIR)/aosp_comet.mk \
-    $(LOCAL_DIR)/factory_comet.mk \
    $(LOCAL_DIR)/lineage_comet.mk
-
-COMMON_LUNCH_CHOICES := \
-    aosp_comet-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/4
+++ b/4
@@ -1,4 +0,0 @@
-per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com,sayanna@google.com,liumartin@google.com,kamewang@google.com
-
-# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,2 +0,0 @@
-[Builtin Hooks]
-jsonlint = true
--- a/aosp_comet.mk
+++ b/aosp_comet.mk
@@ -17,13 +17,10 @@
 TARGET_LINUX_KERNEL_VERSION := 6.1

 $(call inherit-product, device/google/zumapro/aosp_common.mk)
-$(call inherit-product, device/google/comet/comet_generic.mk)
+$(call inherit-product, device/google/comet/device-comet.mk)

 PRODUCT_NAME := aosp_comet
 PRODUCT_DEVICE := comet
 PRODUCT_MODEL := AOSP on comet
 PRODUCT_BRAND := Android
 PRODUCT_MANUFACTURER := Google
-
-DEVICE_MANIFEST_FILE := \
-	device/google/comet/manifest.xml
--- a/audio/comet/aidl_config/mixer_paths_aidl.xml
+++ b/audio/comet/aidl_config/mixer_paths_aidl.xml
@@ -964,6 +964,8 @@
  </path>

  <path name="spatializer-offload-playback-0 -> usb">
+    <!-- Auxel Module id: 27 -->
+    <ctl name="MultiChannel Processor Switch" value="27" />
    <ctl name="USB_RX Mixer EP4" value="1" />
  </path>

--- a/audio/comet/audio-tables.mk
+++ b/audio/comet/audio-tables.mk
@@ -16,32 +16,9 @@

 AUDIO_TABLE_FOLDER := comet

-# Choose AIDL config by build flag.
-ifeq ($(USE_AUDIO_HAL_AIDL),true)
 PRODUCT_SOONG_NAMESPACES += device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/aidl_config
 PRODUCT_PACKAGES += audio_aidl_configs

-else
-# Platform Configuration for AudioHAL / SoundTriggerHAL
-PRODUCT_COPY_FILES += \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_le_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_le_offload_disabled.xml \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
-
-# AudioEffectHAL Configuration
-PRODUCT_COPY_FILES += \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml
-
-# Mixer Path Configuration for AudioHAL
-PRODUCT_COPY_FILES += \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/config/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml
-endif
-
 # Speaker firmware files
 SPK_FIRMWARE_PATH := $(AUDIO_TABLE_FOLDER)/cs35l41/fw
 SPK_FIRMWARE_FULL_PATH := device/google/comet/audio/$(SPK_FIRMWARE_PATH)
@@ -85,26 +62,6 @@ PRODUCT_PACKAGES += \
    uplink_wired_headset_aec_off_config.pb \
    uplink_wired_headset_aec_on_config.pb

-
-# eng specific
-PRODUCT_PACKAGES_ENG += \
-    BLUETOOTH.mods \
-    HANDSFREE.mods \
-    HANDSET.mods \
-    HEADSET.mods \
-    template.xml \
-    tuning_constraints_combination.xml \
-    test_config.ini \
-    test_preset.mps \
-    speaker_post_processing_volume_spec.xml
-
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
-PRODUCT_COPY_FILES += \
-    device/google/comet/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
-
-endif
-
 # Offload spatializer config
 PRODUCT_PACKAGES += \
    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
--- a/audio/comet/config/audio_effects.xml
+++ b/audio/comet/config/audio_effects.xml
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">
-    <libraries>
-        <library name="bundle" path="libbundlewrapper.so"/>
-        <library name="reverb" path="libreverbwrapper.so"/>
-        <library name="visualizer_sw" path="libvisualizer.so"/>
-        <library name="downmix" path="libdownmix.so"/>
-        <library name="dynamics_processing_sw" path="libdynproc.so"/>
-        <library name="loudness_enhancer" path="libldnhncr.so"/>
-        <library name="proxy" path="libeffectproxy.so"/>
-        <library name="offload_effect" path="liboffloadeffect.so"/>
-        <library name="haptic_generator" path="libhapticgenerator.so"/>
-        <library name="spatializer" path="libspatialaudio.so"/>
-    </libraries>
-    <effects>
-        <effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef">
-            <libsw library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>
-            <libhw library="offload_effect" uuid="c7e3b29d-e797-4cf9-9912-17c1956510cc"/>
-        </effectProxy>
-        <effectProxy name="virtualizer" library="proxy" uuid="626499c6-647e-455e-8c45-2d106e23c755">
-            <libsw library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>
-            <libhw library="offload_effect" uuid="f8f88a03-fdf8-4554-8e60-77fbf8f2d3b0"/>
-        </effectProxy>
-        <effectProxy name="equalizer" library="proxy" uuid="49004f03-3391-4c44-97dd-a043d526ea7d">
-            <libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>
-            <libhw library="offload_effect" uuid="50deaa30-4a83-4b1f-bfe3-dec6d605ede0"/>
-        </effectProxy>
-        <effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>
-        <effectProxy name="reverb_env_aux" library="proxy" uuid="b8154738-a0a1-4fc0-bb79-c845a3197739">
-            <libsw library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>
-            <libhw library="offload_effect" uuid="0c84bcd9-bce4-441b-ba9e-51f80897c949"/>
-        </effectProxy>
-        <effectProxy name="reverb_env_ins" library="proxy" uuid="ba0f19fe-8790-4831-a58b-1f3299dd0bae">
-            <libsw library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>
-            <libhw library="offload_effect" uuid="86d1877a-127f-4bdc-9665-c958903ad7b2"/>
-        </effectProxy>
-        <effectProxy name="reverb_pre_aux" library="proxy" uuid="80974a8b-b3be-4c21-8c0b-b392a54e13bc">
-            <libsw library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>
-            <libhw library="offload_effect" uuid="4f90220c-9742-4467-a9d7-122f85c01195"/>
-        </effectProxy>
-        <effectProxy name="reverb_pre_ins" library="proxy" uuid="c02d7dce-ca56-4aea-8c83-bbb53e5600e8">
-            <libsw library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>
-            <libhw library="offload_effect" uuid="a2cf6b45-360b-49f3-94d7-fdb9837f89e8"/>
-        </effectProxy>
-        <effectProxy name="visualizer" library="proxy" uuid="b27271d9-64d6-413c-b316-80005ad09008">
-            <libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>
-            <libhw library="offload_effect" uuid="99fb2ecb-3426-4a0e-8082-1a1da5604b7d"/>
-        </effectProxy>
-        <effectProxy name="dynamics_processing" library="proxy" uuid="dcf01474-8982-11ec-a8a3-0242ac120002">
-            <libsw library="dynamics_processing_sw" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
-            <libhw library="offload_effect" uuid="1bf15eb7-8f49-4fd8-8380-0767fd5680f3"/>
-        </effectProxy>
-        <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
-        <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
-        <effect name="aec" library="offload_effect" uuid="28c28780-ec8b-48b6-8590-8c84557d797d"/>
-        <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
-        <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
-        <effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
-    </effects>
-    <postprocess>
-    </postprocess>
-    <preprocess>
-        <stream type="voice_communication">
-            <apply effect="aec"/>
-            <apply effect="ns"/>
-        </stream>
-    </preprocess>
-</audio_effects_conf>
--- a/audio/comet/config/audio_platform_configuration.xml
+++ b/audio/comet/config/audio_platform_configuration.xml
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2019, 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.                          -->
-<audio_platform_configuration>
-    <hw_intf>
-        <intf id="BE_HW_RX_INTF_0" name="TDM_RX_0" min_bit="24" min_chan="2" min_rate="48000" block_id="16"/>
-        <intf id="BE_HW_RX_INTF_1" name="TDM_RX_1" min_bit="24" min_chan="2" min_rate="48000" block_id="17"/>
-        <intf id="BE_HW_RX_INTF_2" name="USB_RX" min_bit="24" min_chan="2" min_rate="48000" block_id="20"/>
-        <intf id="BE_HW_RX_INTF_3" name="I2S_RX_0" min_bit="24" min_chan="2" min_rate="48000" block_id="18"/>
-        <!--intf id="BE_HW_RX_INTF_2" name="USB_RX" min_bit="24" min_chan="2" min_rate="48000" ctrl_config="USB device" ctrl_rate="Sample Rate" ctrl_bit="Bit Width" ctrl_chan="Channel"/-->
-        <!--intf id="BE_HW_RX_INTF_3" name="BT_RX"/-->
-        <intf id="BE_VIRTUAL_VOICE_RX_TUNING" block_id="19"/>
-        <intf id="BE_VIRTUAL_VOICE_TX_TUNING" block_id="19"/>
-        <intf id="BE_HW_TX_INTF_0" block_id="134,128,137"/>
-        <intf id="BE_VIRTUAL_CRYSTAL_CLEAR_AUDIO_TUNING" block_id="138"/>
-    </hw_intf>
-
-    <product_lists>
-        <product name="Blackbird">
-            <id value="18d1:5033"/>
-        </product>
-        <product name="Condor">
-            <id value="18d1:5034"/>
-        </product>
-        <product name="Condor_Sprint">
-            <id value="18d1:5038"/>
-        </product>
-        <product name="Condor_Sprint2">
-            <id value="18d1:5036"/>
-        </product>
-    </product_lists>
-
-    <!-- The microphone capability is fake data -->
-    <microphone_characteristics>
-        <microphone device_id="builtin_mic_1" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="bottom" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
-            group="0" index_in_the_group="0" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="93"
-            frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00"
-            responses="-0.78 -0.71 -0.64 -0.60 -0.55 -0.50 -0.47 -0.42 -0.39 -0.36 -0.34 -0.33 -0.32 -0.29 -0.28 -0.28 -0.27 -0.25 -0.25 -0.24 -0.23 -0.23 -0.22 -0.22 -0.19 -0.17 -0.15 -0.15 -0.14 -0.14 -0.12 -0.11 -0.10 -0.10 -0.08 -0.07 -0.07 -0.04 -0.03 -0.01 0.00 0.04 0.06 0.07 0.08 0.13 0.09 0.14 0.19 0.23 0.28 0.29 0.31 0.37 0.88 0.86 0.77 0.78 0.84 0.86 1.05 1.12 1.18 1.25 1.43 1.66 1.83 2.02 2.23 2.59 2.84 3.35 4.01 6.82 6.62 6.42 7.30 8.23 7.54 12.68 13.76 18.69 19.68 20.90 23.70 25.10 21.65 16.18 18.84 25.44 23.48 23.22 24.89"
-            sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0269 0.0058 0.0079" />
-        <microphone device_id="builtin_mic_2" type="AUDIO_DEVICE_IN_BACK_MIC" address="back" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
-            group="0" index_in_the_group="1" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="92"
-            frequencies="106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00 20000.00"
-            responses="-0.75 -0.74 -0.69 -0.65 -0.62 -0.61 -0.56 -0.53 -0.50 -0.47 -0.43 -0.40 -0.37 -0.36 -0.33 -0.30 -0.28 -0.25 -0.24 -0.24 -0.24 -0.25 -0.24 -0.12 -0.10 -0.08 -0.09 -0.07 -0.07 -0.06 -0.06 -0.06 -0.05 -0.04 -0.05 -0.04 -0.01 0.02 0.02 0.00 0.02 0.03 0.07 0.10 0.10 0.13 0.01 0.01 0.10 0.11 0.19 0.24 0.38 0.46 0.26 0.27 0.43 0.76 0.75 1.09 1.09 0.94 1.06 1.21 1.47 1.45 1.36 2.07 2.85 2.90 3.85 4.65 5.84 5.46 6.15 7.50 8.30 10.62 12.70 16.65 20.95 25.41 26.32 20.20 16.60 11.24 7.85 7.62 20.19 7.32 2.87 5.18"
-            sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 1.0 0.0" geometric_location="0.0546 0.1456 0.00415" />
-        <microphone device_id="builtin_mic_3" type="AUDIO_DEVICE_IN_BUILTIN_MIC" address="top" location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
-            group="0" index_in_the_group="2" directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI" num_frequency_responses="92"
-            frequencies="100.00 106.00 112.00 118.00 125.00 132.00 140.00 150.00 160.00 170.00 180.00 190.00 200.00 212.00 224.00 236.00 250.00 265.00 280.00 300.00 315.00 335.00 355.00 375.00 400.00 425.00 450.00 475.00 500.00 530.00 560.00 600.00 630.00 670.00 710.00 750.00 800.00 850.00 900.00 950.00 1000.00 1060.00 1120.00 1180.00 1250.00 1320.00 1400.00 1500.00 1600.00 1700.00 1800.00 1900.00 2000.00 2120.00 2240.00 2360.00 2500.00 2650.00 2800.00 3000.00 3150.00 3350.00 3550.00 3750.00 4000.00 4250.00 4500.00 4750.00 5000.00 5300.00 5600.00 6000.00 6300.00 6700.00 7100.00 7500.00 8000.00 8500.00 9000.00 9500.00 10000.00 10600.00 11200.00 11800.00 12500.00 13200.00 14000.00 15000.00 16000.00 17000.00 18000.00 19000.00"
-            responses="-9.24 -9.31 -9.39 -9.45 -9.46 -9.47 -9.50 -9.52 -9.51 -9.52 -9.51 -9.50 -9.49 -9.47 -9.48 -9.49 -9.48 -9.50 -9.51 -9.53 -9.55 -9.59 -9.63 -9.67 -9.58 -9.57 -9.65 -9.68 -9.71 -9.75 -9.79 -9.84 -9.87 -9.87 -9.90 -9.90 -9.91 -9.97 -10.01 -10.05 -9.85 -9.93 -9.94 -9.98 -10.04 -10.12 -10.28 -10.25 -10.01 -9.86 -9.81 -9.82 -9.61 -9.46 -8.27 -8.42 -8.98 -8.99 -8.82 -9.21 -8.92 -8.97 -9.30 -9.44 -9.52 -9.28 -9.09 -8.81 -7.02 -5.72 -5.30 -7.26 -8.39 -12.28 -8.23 -6.99 -5.52 -4.87 -3.82 -6.09 0.00 -2.15 -0.26 1.48 5.22 10.92 6.41 9.55 12.96 3.35 22.00 19.75"
-            sensitivity="-37.0" max_spl="132.5" min_spl="28.5" orientation="0.0 0.0 1.0" geometric_location="0.0274 0.14065 0.0079" />
-    </microphone_characteristics>
-
-    <!-- The microphone mapping of backend device is fake data -->
-    <input_backend_cfg_mic_mapping>
-            <backend_cfg in_cfg="IN_CAMCORDER_LANDSCAPE_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_CAMCORDER_PORTRAIT_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_HANDSET_MIC_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_VOICECALL_HANDSET_MIC_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_VOICECALL_SPEAKER_MIC_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_USB_TTY_VCO_MIC_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_VOICE_RECOGN_MIC_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_UNPROCESSED_MIC_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_UNPROCESSED_DUAL_MIC_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
-            </backend_cfg>
-            <backend_cfg in_cfg="IN_UNPROCESSED_TRIPLE_MIC_BE_CFG">
-                <mic_info mic_device_id="builtin_mic_1"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
-                <mic_info mic_device_id="builtin_mic_2"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED"/>
-                <mic_info mic_device_id="builtin_mic_3"
-                    channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_UNUSED AUDIO_MICROPHONE_CHANNEL_MAPPING_DIRECT"/>
-            </backend_cfg>
-    </input_backend_cfg_mic_mapping>
-
-    <usecase_attr>
-        <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 32 periods * 64 frames(around 1.3ms) * 2ch * 4(s32) = 16384 bytes -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="true" period="64" period_num="32"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
-        <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
-        <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
-        <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
-        <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
-        <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
-        <usecase id="UC_IMMERSIVE_PLAYBACK" dev1="30" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="3"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD, 4 * 128KB buffer -->
-        <usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" dev1="6" dyn_path="true" dsp_vol="true" mmap="false" period="131072" period_num="4" pre_proc_id="14"/>
-        <!-- dev1: audio dev2: haptic -->
-        <usecase id="UC_HAPTIC_AUDIO" dev1="2" dev2="7" period="10" period_num="4"/>
-        <!-- for VOIP output, 4 * 10ms buffer -->
-        <usecase id="UC_VOIP_PLAYBACK" dev1="16" dyn_path="true" dsp_vol="true" mmap="false" period="10" period_num="4" pcm_ch="2"/>
-        <!-- for input -->
-        <usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
-        <usecase id="UC_HOSTLESS_UL" dev1="15"/>
-        <!-- for VOIP input, 4 * 10ms buffer -->
-        <usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2"/>
-        <!-- for input wit AUDIO_INPUT_FLAG_FAST  480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
-        <usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
-        <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
-        <usecase id="UC_MMAP_RECORD" dev1="9" dyn_path="true" mmap="true" period="1" period_num="240"/>
-        <!-- for hifi -->
-        <usecase id="UC_HIFI_PLAYBACK" dev1="25"/>
-        <usecase id="UC_HIFI_RECORD" dev1="26"/>
-    </usecase_attr>
-
-    <dsp_latency>
-        <usecase id="UC_LOW_LATENCY_PLAYBACK" type="playback">
-            <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="20000"/>
-            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="10000"/>
-            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="10000"/>
-            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="10000"/>
-        </usecase>
-
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" type="playback">
-            <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="70000"/>
-            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="70000"/>
-            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="70000"/>
-            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="180000"/>
-        </usecase>
-
-        <usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" type="playback">
-            <be_cfg be_id="OUT_SPEAKER_BE_CFG" latency="40000"/>
-            <be_cfg be_id="OUT_USB_HEADSET_BE_CFG" latency="40000"/>
-            <be_cfg be_id="OUT_USB_HEADPHONE_BE_CFG" latency="40000"/>
-            <be_cfg be_id="OUT_A2DP_BE_CFG" latency="70000"/>
-        </usecase>
-
-        <usecase id="UC_AUDIO_RECORD" type="capture">
-            <be_cfg be_id="IN_CAMCORDER_LANDSCAPE_BE_CFG" latency="160000"/>
-            <be_cfg be_id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
-            <be_cfg be_id="IN_CAMCORDER_PORTRAIT_BE_CFG" latency="160000"/>
-            <be_cfg be_id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" latency="160000"/>
-            <be_cfg be_id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
-            <be_cfg be_id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" latency="160000"/>
-            <be_cfg be_id="IN_BTSCO_MIC_BE_CFG" latency="40000"/>
-            <be_cfg be_id="IN_BTSCO_MIC_NREC_BE_CFG" latency="40000"/>
-            <be_cfg be_id="IN_BTSCO_MIC_WB_BE_CFG" latency="40000"/>
-            <be_cfg be_id="IN_BTSCO_MIC_WB_NREC_BE_CFG" latency="40000"/>
-        </usecase>
-    </dsp_latency>
-
-    <soundcard_name name="google,aoc-snd-card" />
-
-    <features>
-        <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
-        <feature name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN-SPEAKER,ThermistorType:UNKNOWN,ThrottlingSeverity:LIGHT,SpeakerPowerPollWaitMs:20000"/>
-    </features>
-
-    <cfg_attr>
-        <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>
-        <cfg id="OUT_HAC_HANDSET_BE_CFG" intf_name="TDM_RX_1" mux="HW_MUX_GP_1" be_path="hac-handset"/>
-        <cfg id="OUT_USB_HEADSET_BE_CFG">
-            <override product="Blackbird" tuning_id="22"/>
-            <override product="Condor" tuning_id="33"/>
-        </cfg>
-        <cfg id="OUT_USB_TTY_FULL_BE_CFG" be_path="usb-headphone" codec_path="usb-headphone"/>
-        <cfg id="OUT_USB_TTY_VCO_BE_CFG" be_path="usb-headphone" codec_path="usb-headphone"/>
-        <cfg id="OUT_USB_TTY_HCO_BE_CFG" be_path="NULL" codec_path="voice-speaker"/>
-        <cfg id="IN_USB_TTY_FULL_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_USB_TTY_VCO_MIC_BE_CFG" be_path="NULL" codec_path="voice-speaker-mic"/>
-        <cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
-        <cfg id="IN_HANDSET_MIC_BE_CFG" tuning_id="62"/>
-        <cfg id="IN_HANDSET_DUAL_MIC_BE_CFG" tuning_id="63"/>
-        <cfg id="IN_HANDSET_TRIPLE_MIC_BE_CFG" tuning_id="64"/>
-        <cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="70"/>
-        <cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
-        <cfg id="IN_CAMCORDER_PORTRAIT_BE_CFG" tuning_id="72"/>
-        <cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="73"/>
-        <cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="74"/>
-        <cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="75"/>
-        <cfg id="IN_CAMCORDER_MIC_BE_CFG" tuning_id="70"/>
-        <cfg id="IN_CAMCORDER_TRIPLE_MIC_BE_CFG" tuning_id="70"/>
-        <cfg id="IN_BTSCO_MIC_BE_CFG" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_BTSCO_MIC_NREC_BE_CFG" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_BTSCO_MIC_WB_BE_CFG" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_BTSCO_MIC_WB_NREC_BE_CFG" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_VOICE_RECOGN_USB_HEADSET_MIC_BE_CFG" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_USB_HEADSET_MIC_BE_CFG" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_VOICECALL_USB_HEADSET_MIC_BE_CFG" mux="HW_MUX_GP_0"/>
-        <cfg id="IN_UNPROCESSED_USB_HEADSET_MIC_BE_CFG" mux="HW_MUX_GP_0"/>
-    </cfg_attr>
-
-    <xlate_id>
-        <item component="TUNING_COMPONENT_WAVES" id="2"/>
-        <item component="TUNING_COMPONENT_FORTEMEDIA" id="3"/>
-        <item component="TUNING_COMPONENT_CAMCORDER" id="6"/>
-    </xlate_id>
-
-    <voip_db_mapping>
-        <voip_path id="VOIP_RX_USB" value="0.01,0.02,0.04,0.1,0.21,0.47,1.0"/>
-    </voip_db_mapping>
-
-    <device_handle>
-        <handler libname="audio_bt_aoc.so"/>
-        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
-        <handler libname="audio_hdmi_aoc.so"/>
-    </device_handle>
-
-    <external_module>
-        <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/>
-        <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
-        <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl SupportBWE=y"/>
-        <module libname="audio_fortemedia_aoc.so" argu="APPLY_WB_TUNING_FOR_NB_VOICE=y MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
-        <module libname="audio_sounddose_aoc.so"/>
-        <module libname="liboffloadeffect.so"/>
-        <module libname="audio_amcs_ext.so"/>
-        <module libname="audio_bluenote_aoc.so"/>
-        <module libname="audio_compensation_aoc.so" argu="HingeAngle:0,145|LeftChannel:compens_spk_l_1.conf|RightChannel:compens_spk_r_1.conf HingeAngle:146,180|LeftChannel:compens_spk_l_2.conf|RightChannel:compens_spk_r_2.conf"/>
-    </external_module>
-</audio_platform_configuration>
--- a/audio/comet/config/audio_policy_configuration.xml
+++ b/audio/comet/config/audio_policy_configuration.xml
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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.
-->
-<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <globalConfiguration speaker_drc_enabled="false" call_screen_mode_supported="true" />
-    <modules>
-        <!-- Primary Audio HAL -->
-        <module name="primary" halVersion="2.0">
-            <attachedDevices>
-                <item>Speaker</item>
-                <item>Speaker Safe</item>
-                <item>Earpiece</item>
-                <item>Built-In Mic</item>
-                <item>Built-In Back Mic</item>
-                <item>Telephony Tx</item>
-                <item>Voice Call And Telephony Rx</item>
-                <item>Echo Ref In</item>
-            </attachedDevices>
-            <defaultOutputDevice>Speaker</defaultOutputDevice>
-            <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD">
-                    <profile name="" format="AUDIO_FORMAT_MP3"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                </mixPort>
-                <mixPort name="haptic" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_AB" />
-                </mixPort>
-                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             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_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="incall playback" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-                </mixPort>
-                <mixPort name="voice call tx" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-                </mixPort>
-                <mixPort name="voip_rx" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                           samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="primary input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/>
-                </mixPort>
-                <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" >
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="voice call rx" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="voip_tx" role="sink"
-                         flags="AUDIO_INPUT_FLAG_VOIP_TX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_RAW AUDIO_INPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="hifi_playback" role="source" />
-                <mixPort name="hifi_input" role="sink" />
-                <mixPort name="echo_ref_input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
-                </devicePort>
-                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
-                </devicePort>
-                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
-                </devicePort>
-                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
-                </devicePort>
-                <!-- Input devices declaration, i.e. Source DEVICE PORT -->
-                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
-                </devicePort>
-                <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-                            encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-                            encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT BLE Headset" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"
-                            encodedFormats="AUDIO_FORMAT_LC3">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT BLE Speaker" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_LC3">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT BLE Broadcast" type="AUDIO_DEVICE_OUT_BLE_BROADCAST" role="sink"
-                            encodedFormats="AUDIO_FORMAT_LC3">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BLE Headset Mic" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source">
-                </devicePort>
-                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
-                </devicePort>
-                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">
-                </devicePort>
-                <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same value -->
-                <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source">
-                </devicePort>
-                <devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" role="source">
-                </devicePort>
-            </devicePorts>
-            <!-- route declaration, i.e. list all available sources for a given sink -->
-            <routes>
-                <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="BT BLE Headset"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="BT BLE Speaker"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="BT BLE Broadcast"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
-                <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
-                <route type="mix" sink="HDMI Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
-                <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
-                <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
-                <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
-                <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
-                <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
-                <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
-                <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic,BLE Headset Mic"/>
-                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
-                <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
-            </routes>
-        </module>
-        <!-- Bluetooth Audio HAL -->
-        <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
-        <!-- Usb Audio HAL -->
-        <module name="usbv2" halVersion="2.0">
-            <mixPorts>
-                <mixPort name="usb_accessory output" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-            </devicePorts>
-            <routes>
-                <route type="mix" sink="USB Host Out"
-                       sources="usb_accessory output"/>
-            </routes>
-        </module>
-        <!-- Remote Submix Audio HAL -->
-        <xi:include href="r_submix_audio_policy_configuration.xml"/>
-    </modules>
-    <!-- End of Modules section -->
-    <!-- Volume section -->
-    <xi:include href="audio_policy_volumes.xml"/>
-    <xi:include href="default_volume_tables.xml"/>
-    <!-- End of Volume section -->
-</audioPolicyConfiguration>
--- a/audio/comet/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/comet/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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.
-->
-<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <globalConfiguration speaker_drc_enabled="false" call_screen_mode_supported="true" />
-    <modules>
-        <!-- Primary Audio HAL -->
-        <module name="primary" halVersion="2.0">
-            <attachedDevices>
-                <item>Speaker</item>
-                <item>Speaker Safe</item>
-                <item>Earpiece</item>
-                <item>Built-In Mic</item>
-                <item>Built-In Back Mic</item>
-                <item>Telephony Tx</item>
-                <item>Voice Call And Telephony Rx</item>
-                <item>Echo Ref In</item>
-            </attachedDevices>
-            <defaultOutputDevice>Speaker</defaultOutputDevice>
-            <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
-                    <profile name="" format="AUDIO_FORMAT_MP3"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                </mixPort>
-                <mixPort name="haptic" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_AB" />
-                </mixPort>
-                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             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_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="incall playback" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-                </mixPort>
-                <mixPort name="voice call tx" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-                </mixPort>
-                <mixPort name="voip_rx" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                           samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="primary input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/>
-                </mixPort>
-                <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" >
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="voice call rx" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="voip_tx" role="sink"
-                         flags="AUDIO_INPUT_FLAG_VOIP_TX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_RAW AUDIO_INPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="hifi_playback" role="source" />
-                <mixPort name="hifi_input" role="sink" />
-                <mixPort name="echo_ref_input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
-                </devicePort>
-                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
-                </devicePort>
-                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
-                </devicePort>
-                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
-                </devicePort>
-                <!-- Input devices declaration, i.e. Source DEVICE PORT -->
-                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
-                </devicePort>
-                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
-                </devicePort>
-                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">
-                </devicePort>
-                <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same value -->
-                <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source">
-                </devicePort>
-                <devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" role="source">
-                </devicePort>
-            </devicePorts>
-            <!-- route declaration, i.e. list all available sources for a given sink -->
-            <routes>
-                <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
-                <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
-                <route type="mix" sink="HDMI Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
-                <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
-                <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
-                <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
-                <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
-            </routes>
-        </module>
-        <!-- Bluetooth Audio HAL -->
-        <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
-        <!-- Usb Audio HAL -->
-        <module name="usbv2" halVersion="2.0">
-            <mixPorts>
-                <mixPort name="usb_accessory output" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-            </devicePorts>
-            <routes>
-                <route type="mix" sink="USB Host Out"
-                       sources="usb_accessory output"/>
-            </routes>
-        </module>
-        <!-- Remote Submix Audio HAL -->
-        <xi:include href="r_submix_audio_policy_configuration.xml"/>
-    </modules>
-    <!-- End of Modules section -->
-    <!-- Volume section -->
-    <xi:include href="audio_policy_volumes.xml"/>
-    <xi:include href="default_volume_tables.xml"/>
-    <!-- End of Volume section -->
-</audioPolicyConfiguration>
--- a/audio/comet/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/comet/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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.
-->
-<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <globalConfiguration speaker_drc_enabled="false" call_screen_mode_supported="true" />
-    <modules>
-        <!-- Primary Audio HAL -->
-        <module name="primary" halVersion="2.0">
-            <attachedDevices>
-                <item>Speaker</item>
-                <item>Speaker Safe</item>
-                <item>Earpiece</item>
-                <item>Built-In Mic</item>
-                <item>Built-In Back Mic</item>
-                <item>Telephony Tx</item>
-                <item>Voice Call And Telephony Rx</item>
-                <item>Echo Ref In</item>
-            </attachedDevices>
-            <defaultOutputDevice>Speaker</defaultOutputDevice>
-            <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <!--mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
-                    <profile name="" format="AUDIO_FORMAT_MP3"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                </mixPort-->
-                <mixPort name="haptic" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_AB" />
-                </mixPort>
-                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             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_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="incall playback" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-                </mixPort>
-                <mixPort name="voice call tx" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-                </mixPort>
-                <mixPort name="voip_rx" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                           samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="primary input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/>
-                </mixPort>
-                <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" >
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="voice call rx" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="voip_tx" role="sink"
-                         flags="AUDIO_INPUT_FLAG_VOIP_TX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_RAW AUDIO_INPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="hifi_playback" role="source" />
-                <mixPort name="hifi_input" role="sink" />
-                <mixPort name="echo_ref_input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
-                </devicePort>
-                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
-                </devicePort>
-                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
-                </devicePort>
-                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
-                </devicePort>
-                <!-- Input devices declaration, i.e. Source DEVICE PORT -->
-                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
-                </devicePort>
-                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
-                </devicePort>
-                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">
-                </devicePort>
-                <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same value -->
-                <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source">
-                </devicePort>
-                <devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" role="source">
-                </devicePort>
-            </devicePorts>
-            <!-- route declaration, i.e. list all available sources for a given sink -->
-            <routes>
-                <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
-                <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback"/>
-                <route type="mix" sink="HDMI Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx"/>
-                <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,voip_rx,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
-                <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
-                <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
-                <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
-                <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
-            </routes>
-        </module>
-        <!-- A2dp Audio HAL -->
-        <xi:include href="a2dp_audio_policy_configuration_7_0.xml"/>
-        <!-- Usb Audio HAL -->
-        <module name="usbv2" halVersion="2.0">
-            <mixPorts>
-                <mixPort name="usb_accessory output" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-            </devicePorts>
-            <routes>
-                <route type="mix" sink="USB Host Out"
-                       sources="usb_accessory output"/>
-            </routes>
-        </module>
-        <!-- Remote Submix Audio HAL -->
-        <xi:include href="r_submix_audio_policy_configuration.xml"/>
-    </modules>
-    <!-- End of Modules section -->
-    <!-- Volume section -->
-    <xi:include href="audio_policy_volumes.xml"/>
-    <xi:include href="default_volume_tables.xml"/>
-    <!-- End of Volume section -->
-</audioPolicyConfiguration>
--- a/audio/comet/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/comet/config/audio_policy_configuration_le_offload_disabled.xml
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!-- 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.
-->
-<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-    <globalConfiguration speaker_drc_enabled="false" call_screen_mode_supported="true" />
-    <modules>
-        <!-- Primary Audio HAL -->
-        <module name="primary" halVersion="2.0">
-            <attachedDevices>
-                <item>Speaker</item>
-                <item>Speaker Safe</item>
-                <item>Earpiece</item>
-                <item>Built-In Mic</item>
-                <item>Built-In Back Mic</item>
-                <item>Telephony Tx</item>
-                <item>Voice Call And Telephony Rx</item>
-                <item>Echo Ref In</item>
-            </attachedDevices>
-            <defaultOutputDevice>Speaker</defaultOutputDevice>
-            <mixPorts>
-                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="compressed_offload" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">
-                    <profile name="" format="AUDIO_FORMAT_MP3"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_LC"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V1"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                    <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
-                             samplingRates="8000 16000 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
-                </mixPort>
-                <mixPort name="haptic" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_AB" />
-                </mixPort>
-                <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             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_FLOAT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="incall playback" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-                </mixPort>
-                <mixPort name="voice call tx" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO" />
-                </mixPort>
-                <mixPort name="voip_rx" role="source"
-                         flags="AUDIO_OUTPUT_FLAG_VOIP_RX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                           samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-                <mixPort name="primary input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3"/>
-                </mixPort>
-                <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD" maxActiveCount="0" >
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="voice call rx" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="voip_tx" role="sink"
-                         flags="AUDIO_INPUT_FLAG_VOIP_TX">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
-                </mixPort>
-                <mixPort name="fast input" role="sink" flags="AUDIO_INPUT_FLAG_RAW AUDIO_INPUT_FLAG_FAST">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="mmap_no_irq_in" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-                <mixPort name="hifi_playback" role="source" />
-                <mixPort name="hifi_input" role="sink" />
-                <mixPort name="echo_ref_input" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
-                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
-                </devicePort>
-                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">
-                </devicePort>
-                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
-                </devicePort>
-                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
-                </devicePort>
-                <devicePort tagName="HDMI Out" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
-                </devicePort>
-                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">
-                </devicePort>
-                <!-- Input devices declaration, i.e. Source DEVICE PORT -->
-                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
-                </devicePort>
-                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
-                </devicePort>
-                <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
-                            encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
-                            encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
-                            encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-                <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">
-                </devicePort>
-                <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source">
-                </devicePort>
-                <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same value -->
-                <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" role="source">
-                </devicePort>
-                <devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" role="source">
-                </devicePort>
-            </devicePorts>
-            <!-- route declaration, i.e. list all available sources for a given sink -->
-            <routes>
-                <route type="mix" sink="Speaker"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="Speaker Safe"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="Earpiece"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="BT A2DP Out"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="BT A2DP Headphones"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="BT A2DP Speaker"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
-                <route type="mix" sink="USB Device Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
-                <route type="mix" sink="USB Headset Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
-                <route type="mix" sink="HDMI Out"
-                       sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
-                <route type="mix" sink="BT SCO"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="BT SCO Headset"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="BT SCO Car Kit"
-                       sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
-                <route type="mix" sink="Telephony Tx" sources="incall playback,voice call tx" />
-                <route type="mix" sink="primary input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="hotword input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="incall capture" sources="Voice Call And Telephony Rx" />
-                <route type="mix" sink="voice call rx" sources="Voice Call And Telephony Rx" />
-                <route type="mix" sink="voip_tx"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="fast input"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="mmap_no_irq_in"
-                       sources="Built-In Mic,Built-In Back Mic,USB Device In,USB Headset In,BT SCO Headset Mic"/>
-                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />
-                <route type="mix" sink="echo_ref_input" sources="Echo Ref In"/>
-            </routes>
-        </module>
-        <!-- Bluetooth Audio HAL -->
-        <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
-        <!-- Usb Audio HAL -->
-        <module name="usbv2" halVersion="2.0">
-            <mixPorts>
-                <mixPort name="usb_accessory output" role="source">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </mixPort>
-            </mixPorts>
-            <devicePorts>
-                <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink">
-                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-                </devicePort>
-            </devicePorts>
-            <routes>
-                <route type="mix" sink="USB Host Out"
-                       sources="usb_accessory output"/>
-            </routes>
-        </module>
-        <!-- Remote Submix Audio HAL -->
-        <xi:include href="r_submix_audio_policy_configuration.xml"/>
-    </modules>
-    <!-- End of Modules section -->
-    <!-- Volume section -->
-    <xi:include href="audio_policy_volumes.xml"/>
-    <xi:include href="default_volume_tables.xml"/>
-    <!-- End of Volume section -->
-</audioPolicyConfiguration>
--- a/audio/comet/config/audio_policy_volumes.xml
+++ b/audio/comet/config/audio_policy_volumes.xml
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-->
-<!-- Volume section defines a volume curve for a given use case and device category.
-It contains a list of points of this curve expressing the attenuation in Millibels for a given
-volume index from 0 to 100.
-<volume stream=”AUDIO_STREAM_MUSIC” deviceCategory=””>
-<point>0,-9600</point>
-<point>100,0</point>
-</volume>
-->
-
-<volumes>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                             ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                             ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>1,-3000</point>
-        <point>33,-2600</point>
-        <point>66,-2200</point>
-        <point>100,-1800</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4000</point>
-        <point>71,-1800</point>
-        <point>100,-1000</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                         ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                         ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                       ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-2800</point>
-        <point>71,-700</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                       ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                       ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5750</point>
-        <point>32,-3200</point>
-        <point>60,-1700</point>
-        <point>80,-1000</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                        ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                        ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                        ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-3500</point>
-        <point>1,-3000</point>
-        <point>71,-600</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                        ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                        ref="DEFAULT_NON_MUTABLE_EXT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                        ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-3300</point>
-        <point>57,-1700</point>
-        <point>71,-1100</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                               ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                               ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EARPIECE">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>1,-3000</point>
-        <point>33,-2600</point>
-        <point>66,-2200</point>
-        <point>100,-1800</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4960</point>
-        <point>100,0</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                   ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                   ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">
-        <point>1,-3000</point>
-        <point>33,-2600</point>
-        <point>66,-2200</point>
-        <point>100,-1800</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4900</point>
-        <point>57,-2200</point>
-        <point>100,-550</point>
-    </volume>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                       ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                       ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                      ref="SILENT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                      ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                      ref="SILENT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                      ref="SILENT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                      ref="SILENT_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                ref="DEFAULT_NON_MUTABLE_SPEAKER_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                            ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                        ref="FULL_SCALE_VOLUME_CURVE"/>
-</volumes>
-
--- a/audio/comet/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/comet/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
-<module name="bluetooth" halVersion="2.0">
-    <mixPorts>
-        <!-- A2DP Audio Ports -->
-        <mixPort name="a2dp output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"/>
-        <!-- Hearing AIDs Audio Ports -->
-        <mixPort name="hearing aid output" role="source">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="24000 16000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </mixPort>
-        <!-- 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"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </mixPort>
-        <mixPort name="le audio input" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="8000 16000 24000 32000 44100 48000"
-                     channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-            <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
-                     samplingRates="8000 16000 24000 32000 44100 48000"
-                     channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-            <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                     samplingRates="8000 16000 24000 32000 44100 48000"
-                     channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
-        </mixPort>
-    </mixPorts>
-    <devicePorts>
-        <!-- A2DP Audio Ports -->
-        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100 48000 88200 96000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </devicePort>
-        <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100 48000 88200 96000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </devicePort>
-        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
-            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100 48000 88200 96000"
-                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        </devicePort>
-        <!-- Hearing AIDs Audio Ports -->
-        <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
-        <!-- BLE Audio Ports -->
-        <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"
-               sources="a2dp output"/>
-        <route type="mix" sink="BT A2DP Headphones"
-               sources="a2dp output"/>
-        <route type="mix" sink="BT A2DP Speaker"
-               sources="a2dp output"/>
-        <route type="mix" sink="BT Hearing Aid Out"
-               sources="hearing aid output"/>
-        <route type="mix" sink="BLE Headset Out"
-               sources="le audio output"/>
-        <route type="mix" sink="le audio input"
-               sources="BLE Headset In"/>
-        <route type="mix" sink="BLE Speaker Out"
-            sources="le audio output"/>
-        <route type="mix" sink="BLE Broadcast Out"
-            sources="le audio broadcast output"/>
-    </routes>
-</module>
--- a/audio/comet/config/mixer_paths.xml
+++ b/audio/comet/config/mixer_paths.xml
@@ -1,913 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 2019, 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 default value of ALSA command -->
-    <!-- PCM timeout -->
-    <ctl name="PCM Stream Wait Time in MSec" value="100"/>
-    <ctl name="Voice PCM Stream Wait Time in MSec" value="500"/>
-
-    <!-- Enable it when AOC is ready to trim delay and padding -->
-    <ctl name="Gapless Offload Enable" value="1"/>
-
-    <!-- TDM 0 setting -->
-    <ctl name="TDM_0_RX Chan" value="Four"/>
-    <ctl name="TDM_0_RX Format" value="S32_LE"/>
-    <ctl name="TDM_0_RX Sample Rate" value="SR_48K" />
-    <ctl name="TDM_0_TX Chan" value="Four"/>
-    <ctl name="TDM_0_TX Format" value="S32_LE"/>
-    <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
-
-    <!-- Haptic setting -->
-    <ctl name="Haptics Source" value="PCM"/>
-    <ctl name="HAPTIC_RX Format" value="S32_LE"/>
-    <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
-    <ctl name="HAPTIC_RX Chan" value="Four"/>
-    <ctl name="HAPTIC_RX nSlot" value="Four"/>
-    <ctl name="RX Slots" id="0" value="2"/>
-    <ctl name="RX Slots" id="1" value="3"/>
-
-    <!-- Cirrus default 96K -->
-    <ctl name="Default 96K" value="0"/>
-    <ctl name="R Default 96K" value="0"/>
-
-    <!-- Cirrus Booster Amp TDM slot assignment-->
-    <!-- RX slot -->
-    <ctl name="ASPRX1 Slot Position" value="0"/>
-    <ctl name="ASPRX2 Slot Position" value="1"/>
-    <ctl name="R ASPRX1 Slot Position" value="1"/>
-    <ctl name="R ASPRX2 Slot Position" value="0"/>
-    <!-- TX slot -->
-    <ctl name="ASPTX1 Slot Position" value="0"/>
-    <ctl name="R ASPTX1 Slot Position" value="1"/>
-    <ctl name="ASPTX2 Slot Position" value="2"/>
-    <ctl name="R ASPTX2 Slot Position" value="3"/>
-    <ctl name="ASPTX3 Slot Position" value="4"/>
-    <ctl name="R ASPTX3 Slot Position" value="5"/>
-    <ctl name="ASPTX4 Slot Position" value="6"/>
-    <ctl name="R ASPTX4 Slot Position" value="7"/>
-
-    <!-- Cirrus Booster Amp DRE and VBST config-->
-    <ctl name="DRE DRE Switch" value="1"/>
-    <ctl name="R DRE DRE Switch" value="1"/>
-
-    <!-- Cirrus Booster Amp Output Gain -->
-    <ctl name="AMP PCM Gain" value="17"/>
-    <ctl name="R AMP PCM Gain" value="17"/>
-    <ctl name="Digital PCM Volume" value="817"/>
-    <ctl name="R Digital PCM Volume" value="817"/>
-
-    <!-- Cirrus Booster Amp Power -->
-    <ctl name="Main AMP Enable Switch" value="0"/>
-    <ctl name="R Main AMP Enable Switch" value="0"/>
-
-    <!-- Cirrus Booster mode -->
-    <ctl name="PCM Source" value="DSP"/>
-    <ctl name="R PCM Source" value="DSP"/>
-    <ctl name="DSP1 Firmware" value="Protection"/>
-    <ctl name="R DSP1 Firmware" value="Protection"/>
-    <ctl name="DSP RX1 Source" value="ASPRX1"/>
-    <ctl name="DSP RX2 Source" value="ASPRX1"/>
-    <ctl name="R DSP RX1 Source" value="ASPRX1"/>
-    <ctl name="R DSP RX2 Source" value="ASPRX1"/>
-    <ctl name="Boost Peak Current Limit" value="3.50A"/>
-    <ctl name="R Boost Peak Current Limit" value="3.50A"/>
-
-    <!-- Cirrus ASP TX source -->
-    <ctl name="ASP TX1 Source" value="VMON" />
-    <ctl name="R ASP TX1 Source" value="VMON" />
-    <ctl name="ASP TX2 Source" value="IMON" />
-    <ctl name="R ASP TX2 Source" value="IMON" />
-    <ctl name="ASP TX3 Source" value="Zero" />
-    <ctl name="R ASP TX3 Source" value="Zero" />
-    <ctl name="ASP TX4 Source" value="Zero" />
-    <ctl name="R ASP TX4 Source" value="Zero" />
-
-    <!-- Cirrus fast switch init -->
-    <ctl name="Fast Use Case Switch Enable" value="0" />
-    <ctl name="Fast Use Case Delta File" value="fast_switch2.txt" />
-    <ctl name="R Fast Use Case Switch Enable" value="0" />
-    <ctl name="R Fast Use Case Delta File" value="fast_switch3.txt" />
-
-    <!-- default EP volume -->
-    <ctl name="PCM Playback Switch" value="1"/>
-    <ctl name="PCM Playback Volume" value="10"/>
-
-    <!-- audio RX route initial/default value -->
-    <ctl name="TDM_0_RX Mixer EP1" value="0"/>
-    <ctl name="TDM_0_RX Mixer EP2" value="0"/>
-    <ctl name="TDM_0_RX Mixer EP3" value="0"/>
-    <ctl name="TDM_0_RX Mixer EP4" value="0"/>
-    <ctl name="TDM_0_RX Mixer EP5" value="0"/>
-    <ctl name="TDM_0_RX Mixer EP6" value="0"/>
-    <ctl name="TDM_0_RX Mixer EP7" value="0"/>
-    <ctl name="TDM_0_RX Mixer EP8" value="0"/>
-    <ctl name="TDM_0_RX Mixer NoHost1" value="0"/>
-    <ctl name="TDM_0_RX Mixer VOIP" value="0"/>
-    <ctl name="TDM_0_RX Mixer RAW" value="0"/>
-    <ctl name="TDM_0_RX Mixer IMSV" value="0"/>
-
-    <ctl name="TDM_1_RX Mixer EP1" value="0"/>
-    <ctl name="TDM_1_RX Mixer EP2" value="0"/>
-    <ctl name="TDM_1_RX Mixer EP3" value="0"/>
-    <ctl name="TDM_1_RX Mixer EP4" value="0"/>
-    <ctl name="TDM_1_RX Mixer EP5" value="0"/>
-    <ctl name="TDM_1_RX Mixer EP6" value="0"/>
-    <ctl name="TDM_1_RX Mixer EP7" value="0"/>
-    <ctl name="TDM_1_RX Mixer EP8" value="0"/>
-    <ctl name="TDM_1_RX Mixer NoHost1" value="0"/>
-
-    <ctl name="USB_RX Mixer EP1" value="0"/>
-    <ctl name="USB_RX Mixer EP2" value="0"/>
-    <ctl name="USB_RX Mixer EP3" value="0"/>
-    <ctl name="USB_RX Mixer EP4" value="0"/>
-    <ctl name="USB_RX Mixer EP5" value="0"/>
-    <ctl name="USB_RX Mixer EP6" value="0"/>
-    <ctl name="USB_RX Mixer EP7" value="0"/>
-    <ctl name="USB_RX Mixer NoHost1" value="0"/>
-    <ctl name="USB_RX Mixer VOIP" value="0"/>
-    <ctl name="USB_RX Mixer HIFI" value="0"/>
-    <ctl name="USB_RX Mixer RAW" value="0"/>
-    <ctl name="USB_RX Mixer IMSV" value="0"/>
-
-    <ctl name="BT_RX Mixer EP1" value="0"/>
-    <ctl name="BT_RX Mixer EP2" value="0"/>
-    <ctl name="BT_RX Mixer EP3" value="0"/>
-    <ctl name="BT_RX Mixer EP4" value="0"/>
-    <ctl name="BT_RX Mixer EP5" value="0"/>
-    <ctl name="BT_RX Mixer EP6" value="0"/>
-    <ctl name="BT_RX Mixer EP7" value="0"/>
-    <ctl name="BT_RX Mixer NoHost1" value="0"/>
-    <ctl name="BT_RX Mixer VOIP" value="0"/>
-    <ctl name="BT_RX Mixer RAW" value="0"/>
-    <ctl name="BT_RX Mixer IMSV" value="0"/>
-
-    <ctl name="INCALL_RX Mixer EP1" value="0"/>
-    <ctl name="INCALL_RX Mixer EP2" value="0"/>
-    <ctl name="INCALL_RX Mixer EP3" value="0"/>
-    <ctl name="INCALL_RX Mixer EP4" value="0"/>
-    <ctl name="INCALL_RX Mixer EP5" value="0"/>
-    <ctl name="INCALL_RX Mixer EP6" value="0"/>
-    <ctl name="INCALL_RX Mixer EP7" value="0"/>
-    <ctl name="INCALL_RX Mixer NoHost1" value="0"/>
-
-    <ctl name="SINK_IDS" id="0" value="-1"/>
-    <ctl name="SINK_IDS" id="1" value="-1"/>
-
-    <!-- audio TX route initial/default value -->
-    <ctl name="EP1 TX Mixer TDM_0_TX" value="0"/>
-    <ctl name="EP2 TX Mixer TDM_0_TX" value="0"/>
-    <ctl name="EP3 TX Mixer TDM_0_TX" value="0"/>
-    <ctl name="EP4 TX Mixer TDM_0_TX" value="0"/>
-    <ctl name="EP5 TX Mixer TDM_0_TX" value="0"/>
-    <ctl name="EP6 TX Mixer TDM_0_TX" value="0"/>
-    <ctl name="NoHost1 TX Mixer TDM_0_TX" value="0"/>
-
-    <ctl name="EP1 TX Mixer TDM_1_TX" value="0"/>
-    <ctl name="EP2 TX Mixer TDM_1_TX" value="0"/>
-    <ctl name="EP3 TX Mixer TDM_1_TX" value="0"/>
-    <ctl name="EP4 TX Mixer TDM_1_TX" value="0"/>
-    <ctl name="EP5 TX Mixer TDM_1_TX" value="0"/>
-    <ctl name="EP6 TX Mixer TDM_1_TX" value="0"/>
-    <ctl name="NoHost1 TX Mixer TDM_1_TX" value="0"/>
-
-    <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="0"/>
-    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="0"/>
-    <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="0"/>
-    <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="0"/>
-    <ctl name="EP5 TX Mixer INTERNAL_MIC_TX" value="0"/>
-    <ctl name="EP6 TX Mixer INTERNAL_MIC_TX" value="0"/>
-    <ctl name="NoHost1 TX Mixer INTERNAL_MIC_TX" value="0"/>
-    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="0"/>
-
-    <ctl name="EP1 TX Mixer BT_TX" value="0"/>
-    <ctl name="EP2 TX Mixer BT_TX" value="0"/>
-    <ctl name="EP3 TX Mixer BT_TX" value="0"/>
-    <ctl name="EP4 TX Mixer BT_TX" value="0"/>
-    <ctl name="EP5 TX Mixer BT_TX" value="0"/>
-    <ctl name="EP6 TX Mixer BT_TX" value="0"/>
-    <ctl name="NoHost1 TX Mixer BT_TX" value="0"/>
-    <ctl name="VOIP TX Mixer BT_TX" value="0"/>
-
-    <ctl name="EP1 TX Mixer USB_TX" value="0"/>
-    <ctl name="EP2 TX Mixer USB_TX" value="0"/>
-    <ctl name="EP3 TX Mixer USB_TX" value="0"/>
-    <ctl name="EP4 TX Mixer USB_TX" value="0"/>
-    <ctl name="EP5 TX Mixer USB_TX" value="0"/>
-    <ctl name="EP6 TX Mixer USB_TX" value="0"/>
-    <ctl name="NoHost1 TX Mixer USB_TX" value="0"/>
-    <ctl name="VOIP TX Mixer USB_TX" value="0"/>
-
-    <ctl name="EP1 TX Mixer INCALL_TX" value="0"/>
-    <ctl name="EP2 TX Mixer INCALL_TX" value="0"/>
-    <ctl name="EP3 TX Mixer INCALL_TX" value="0"/>
-    <ctl name="EP4 TX Mixer INCALL_TX" value="0"/>
-    <ctl name="EP5 TX Mixer INCALL_TX" value="0"/>
-    <ctl name="EP6 TX Mixer INCALL_TX" value="0"/>
-    <ctl name="NoHost1 TX Mixer INCALL_TX" value="0"/>
-
-    <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="0"/>
-    <ctl name="EP4 TX Mixer I2S_2_TX" value="0"/>
-
-    <!-- AoC Mic setting -->
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC HW Gain At High Power Mode (cB)" value="0" />
-    <ctl name="MIC Record Soft Gain (dB)" value="-40"/>
-
-    <!-- USB setting v2 -->
-    <ctl name="USB Bus ID v2" value="1"/>
-    <ctl name="USB Dev ID v2" value="2"/>
-    <ctl name="USB Playback EP ID v2" value="1"/>
-    <ctl name="USB Playback FORMAT v2" value="0"/>
-    <ctl name="USB Playback SR v2" value="48000"/>
-    <ctl name="USB Playback CH v2" value="2"/>
-    <ctl name="USB Playback BW v2" value="24"/>
-    <ctl name="USB Capture EP ID v2" value="1"/>
-    <ctl name="USB Capture FORMAT v2" value="0"/>
-    <ctl name="USB Capture SR v2" value="48000"/>
-    <ctl name="USB Capture CH v2" value="1"/>
-    <ctl name="USB Capture BW v2" value="16"/>
-
-    <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON"/>
-    <ctl name="Voice Call Mic Source" value="Builtin_MIC"/>
-    <ctl name="Mic Spatial Module Enable" value="0"/>
-    <ctl name="Audio Capture Eraser Enable" value="0"/>
-
-    <!-- audio PDM mic default state -->
-    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1"/>
-    <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="Audio Capture Mic Source" value="Builtin_MIC"/>
-
-    <!-- audio Ultrasound mic default state -->
-    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="-1"/>
-    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1"/>
-    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1"/>
-    <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
-
-    <!-- sidetone controls -->
-    <ctl name="Sidetone Enable" value="0"/>
-    <ctl name="Sidetone Volume" value="-96"/>
-    <ctl name="Sidetone Selected Mic" value="0"/>
-    <ctl name="Sidetone EQ Stage Number" value="1"/>
-    <!-- IEEE 754, value is in float -->
-    <ctl name="Sidetone Biquad0" id="0" value="0"/>
-    <ctl name="Sidetone Biquad0" id="1" value="0"/>
-    <ctl name="Sidetone Biquad0" id="2" value="0"/>
-    <ctl name="Sidetone Biquad0" id="3" value="0"/>
-    <ctl name="Sidetone Biquad0" id="4" value="0"/>
-    <ctl name="Sidetone Biquad0" id="5" value="0"/>
-    <ctl name="Sidetone Biquad1" id="0" value="0"/>
-    <ctl name="Sidetone Biquad1" id="1" value="0"/>
-    <ctl name="Sidetone Biquad1" id="2" value="0"/>
-    <ctl name="Sidetone Biquad1" id="3" value="0"/>
-    <ctl name="Sidetone Biquad1" id="4" value="0"/>
-    <ctl name="Sidetone Biquad1" id="5" value="0"/>
-    <ctl name="Sidetone Biquad2" id="0" value="0"/>
-    <ctl name="Sidetone Biquad2" id="1" value="0"/>
-    <ctl name="Sidetone Biquad2" id="2" value="0"/>
-    <ctl name="Sidetone Biquad2" id="3" value="0"/>
-    <ctl name="Sidetone Biquad2" id="4" value="0"/>
-    <ctl name="Sidetone Biquad2" id="5" value="0"/>
-    <ctl name="Sidetone Biquad3" id="0" value="0"/>
-    <ctl name="Sidetone Biquad3" id="1" value="0"/>
-    <ctl name="Sidetone Biquad3" id="2" value="0"/>
-    <ctl name="Sidetone Biquad3" id="3" value="0"/>
-    <ctl name="Sidetone Biquad3" id="4" value="0"/>
-    <ctl name="Sidetone Biquad3" id="5" value="0"/>
-    <ctl name="Sidetone Biquad4" id="0" value="0"/>
-    <ctl name="Sidetone Biquad4" id="1" value="0"/>
-    <ctl name="Sidetone Biquad4" id="2" value="0"/>
-    <ctl name="Sidetone Biquad4" id="3" value="0"/>
-    <ctl name="Sidetone Biquad4" id="4" value="0"/>
-    <ctl name="Sidetone Biquad4" id="5" value="0"/>
-
-    <ctl name="Incall Capture Stream0" value="Off"/>
-    <ctl name="Incall Capture Stream1" value="Off"/>
-    <ctl name="Incall Capture Stream2" value="Off"/>
-
-    <!-- These two controls control the muting function of mics and sinks during the voice call. -->
-    <!-- They would be enabled by HAL. -->
-    <ctl name="Incall Sink Mute" value="0"/>
-    <ctl name="Incall Mic Mute" value="0"/>
-
-    <!-- Decoder Reference Enable is controlled in aoc_control -->
-    <ctl name="Decoder Reference Enable" value="0"/>
-    <ctl name="LVM Enable" value="0"/>
-
-    <!-- sidetone dynamic control -->
-    <path name="sidetone-for handset">
-        <!-- 1065353216 = 0x3f800000 = 1.0 -->
-        <ctl name="Sidetone Biquad0" id="0" value="1065353216"/>
-        <ctl name="Sidetone Biquad0" id="1" value="1065353216"/>
-        <ctl name="Sidetone Biquad0" id="2" value="0"/>
-        <ctl name="Sidetone Biquad0" id="3" value="0"/>
-        <ctl name="Sidetone Biquad0" id="4" value="0"/>
-        <ctl name="Sidetone Biquad0" id="5" value="0"/>
-        <ctl name="Sidetone Biquad1" id="0" value="1065353216"/>
-        <ctl name="Sidetone Biquad1" id="1" value="1065353216"/>
-        <ctl name="Sidetone Biquad1" id="2" value="0"/>
-        <ctl name="Sidetone Biquad1" id="3" value="0"/>
-        <ctl name="Sidetone Biquad1" id="4" value="0"/>
-        <ctl name="Sidetone Biquad1" id="5" value="0"/>
-        <ctl name="Sidetone Biquad2" id="0" value="1065353216"/>
-        <ctl name="Sidetone Biquad2" id="1" value="1065353216"/>
-        <ctl name="Sidetone Biquad2" id="2" value="0"/>
-        <ctl name="Sidetone Biquad2" id="3" value="0"/>
-        <ctl name="Sidetone Biquad2" id="4" value="0"/>
-        <ctl name="Sidetone Biquad2" id="5" value="0"/>
-        <ctl name="Sidetone Biquad3" id="0" value="1065353216"/>
-        <ctl name="Sidetone Biquad3" id="1" value="1065353216"/>
-        <ctl name="Sidetone Biquad3" id="2" value="0"/>
-        <ctl name="Sidetone Biquad3" id="3" value="0"/>
-        <ctl name="Sidetone Biquad3" id="4" value="0"/>
-        <ctl name="Sidetone Biquad3" id="5" value="0"/>
-        <ctl name="Sidetone Biquad4" id="0" value="1065353216"/>
-        <ctl name="Sidetone Biquad4" id="1" value="1065353216"/>
-        <ctl name="Sidetone Biquad4" id="2" value="0"/>
-        <ctl name="Sidetone Biquad4" id="3" value="0"/>
-        <ctl name="Sidetone Biquad4" id="4" value="0"/>
-        <ctl name="Sidetone Biquad4" id="5" value="0"/>
-        <ctl name="Sidetone EQ Stage Number" value="5"/>
-        <ctl name="Sidetone Volume" value="-90"/>
-        <ctl name="Sidetone Enable" value="1"/>
-    </path>
-
-    <!-- audio playback dynamic route -->
-    <path name="deep-buffer-playbackP">
-        <ctl name="TDM_0_RX Mixer EP6" value="1"/>
-    </path>
-
-    <path name="deep-buffer-playbackP hac-handset">
-    </path>
-
-    <path name="deep-buffer-playbackP bt">
-        <ctl name="BT_RX Mixer EP6" value="1"/>
-    </path>
-
-    <path name="deep-buffer-playbackP usb-headphone">
-        <ctl name="USB_RX Mixer EP6" value="1"/>
-    </path>
-
-    <path name="deep-buffer-playbackP hearing-aid">
-    </path>
-
-    <path name="low-latency-playbackP">
-        <ctl name="TDM_0_RX Mixer EP2" value="1"/>
-    </path>
-
-    <path name="low-latency-playbackP hac-handset">
-    </path>
-
-    <path name="low-latency-playbackP bt">
-        <ctl name="BT_RX Mixer EP2" value="1"/>
-    </path>
-
-    <path name="low-latency-playbackP usb-headphone">
-        <ctl name="USB_RX Mixer EP2" value="1"/>
-    </path>
-
-    <path name="low-latency-playbackP hearing-aid">
-    </path>
-
-    <path name="raw-playbackP">
-        <ctl name="TDM_0_RX Mixer RAW" value="1"/>
-    </path>
-
-    <path name="raw-playbackP hac-handset">
-    </path>
-
-    <path name="raw-playbackP usb-headphone">
-        <ctl name="USB_RX Mixer RAW" value="1"/>
-    </path>
-
-    <path name="raw-playbackP hearing-aid">
-    </path>
-
-    <path name="raw-playbackP bt">
-        <ctl name="BT_RX Mixer RAW" value="1"/>
-    </path>
-
-    <path name="mmap-playbackP">
-        <ctl name="TDM_0_RX Mixer EP1" value="1"/>
-    </path>
-
-    <path name="mmap-playbackP hac-handset">
-    </path>
-
-    <path name="mmap-playbackP usb-headphone">
-        <ctl name="USB_RX Mixer EP1" value="1"/>
-    </path>
-
-    <path name="mmap-playbackP bt">
-        <ctl name="BT_RX Mixer EP1" value="1"/>
-    </path>
-
-    <path name="mmap-playbackP hearing-aid">
-    </path>
-
-    <path name="compress-offload-playback">
-        <ctl name="LVM Enable" value="1" />
-    </path>
-
-    <path name="compress-offload-playbackP">
-        <path name="compress-offload-playback" />
-        <ctl name="TDM_0_RX Mixer EP7" value="1"/>
-    </path>
-
-    <path name="compress-offload-playbackP hac-handset">
-        <path name="compress-offload-playback" />
-    </path>
-
-    <path name="compress-offload-playbackP bt">
-        <path name="compress-offload-playback" />
-        <ctl name="BT_RX Mixer EP7" value="1"/>
-    </path>
-
-    <path name="compress-offload-playbackP usb-headphone">
-        <path name="compress-offload-playback" />
-        <ctl name="USB_RX Mixer EP7" value="1"/>
-    </path>
-
-    <path name="compress-offload-playbackP hearing-aid">
-        <path name="compress-offload-playback" />
-    </path>
-
-    <path name="immersive-playbackP">
-        <ctl name="TDM_0_RX Mixer IMSV" value="1"/>
-    </path>
-
-    <path name="immersive-playbackP bt">
-        <ctl name="BT_RX Mixer IMSV" value="1"/>
-    </path>
-
-    <path name="immersive-playbackP usb-headphone">
-        <ctl name="USB_RX Mixer IMSV" value="1"/>
-    </path>
-
-    <path name="voip-playbackP">
-        <ctl name="TDM_0_RX Mixer VOIP" value="1"/>
-    </path>
-
-    <path name="voip-playbackP hac-handset">
-    </path>
-
-    <path name="voip-playbackP bt">
-        <ctl name="BT_RX Mixer VOIP" value="1"/>
-    </path>
-
-    <path name="voip-playbackP usb-headphone">
-        <ctl name="USB_RX Mixer VOIP" value="1"/>
-    </path>
-
-    <path name="voip-playbackP hearing-aid">
-    </path>
-
-    <path name="haptic-audioP">
-        <ctl name="TDM_0_RX Mixer EP3" value="1"/>
-        <ctl name="TDM_0_RX Mixer EP8" value="1"/>
-    </path>
-
-    <path name="haptic-audioP hac-handset">
-    </path>
-
-    <path name="haptic-audioP bt">
-        <ctl name="BT_RX Mixer EP3" value="1"/>
-        <ctl name="TDM_0_RX Mixer EP8" value="1"/>
-    </path>
-
-    <path name="haptic-audioP usb-headphone">
-        <ctl name="USB_RX Mixer EP3" value="1"/>
-        <ctl name="TDM_0_RX Mixer EP8" value="1"/>
-    </path>
-
-    <path name="hifi-playbackP">
-    </path>
-
-    <path name="hifi-playbackP usb-headphone">
-        <ctl name="USB_RX Mixer HIFI" value="1"/>
-    </path>
-
-    <path name="hifi-recordC">
-    </path>
-
-    <path name="hifi-recordC usb-headset-mic">
-    </path>
-
-    <!-- audio capture dynamic route -->
-    <path name="ultrasound-recordC">
-        <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1"/>
-    </path>
-
-    <path name="audio-recordC">
-        <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1"/>
-    </path>
-
-    <path name="audio-recordC usb-headset-mic">
-        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
-    </path>
-
-    <path name="audio-recordC bt-mic">
-        <ctl name="EP1 TX Mixer BT_TX" value="1"/>
-    </path>
-
-    <path name="voip-recordC">
-        <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1"/>
-    </path>
-
-    <path name="voip-recordC usb-headset-mic">
-        <ctl name="VOIP TX Mixer USB_TX" value="1"/>
-    </path>
-
-    <path name="voip-recordC bt-mic">
-        <ctl name="VOIP TX Mixer BT_TX" value="1"/>
-    </path>
-
-    <!-- voice-call dynamic route -->
-    <path name="voice-callP">
-        <ctl name="TDM_0_RX Mixer EP5" value="1"/>
-    </path>
-
-    <path name="voice-callP bt">
-        <ctl name="BT_RX Mixer EP5" value="1"/>
-    </path>
-
-    <path name="voice-callP usb-headphone">
-        <ctl name="USB_RX Mixer EP5" value="1"/>
-    </path>
-
-    <path name="voice-callP hearing-aid">
-        <ctl name="INCALL_RX Mixer EP5" value="1"/>
-    </path>
-
-    <path name="voice-callP call-screen">
-        <ctl name="INCALL_RX Mixer EP5" value="1"/>
-    </path>
-
-    <path name="voice-callC">
-        <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1"/>
-    </path>
-
-    <path name="voice-callC usb-headset-mic">
-        <ctl name="EP4 TX Mixer USB_TX" value="1"/>
-    </path>
-
-    <path name="voice-callC bt-mic">
-        <ctl name="EP4 TX Mixer BT_TX" value="1"/>
-    </path>
-
-    <path name="voice-callC hearing-aid">
-        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
-    </path>
-
-    <path name="voice-callC call-screen">
-        <ctl name="EP4 TX Mixer INCALL_TX" value="1"/>
-    </path>
-
-    <path name="hostless-ulC spk-vi">
-        <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1"/>
-    </path>
-
-    <path name="telephony-rx-captureC">
-        <ctl name="Incall Capture Stream0" value="DL"/>
-    </path>
-
-    <path name="incall-capture1C uplink">
-        <ctl name="Incall Capture Stream1" value="UL"/>
-    </path>
-
-    <path name="incall-capture1C downlink">
-        <ctl name="Incall Capture Stream1" value="DL"/>
-    </path>
-
-    <path name="incall-capture1C call">
-        <ctl name="Incall Capture Stream1" value="UL_DL"/>
-    </path>
-
-    <path name="incall-capture2C uplink">
-        <ctl name="Incall Capture Stream2" value="UL"/>
-    </path>
-
-    <path name="incall-capture2C downlink">
-        <ctl name="Incall Capture Stream2" value="DL"/>
-    </path>
-
-    <path name="incall-capture2C call">
-        <ctl name="Incall Capture Stream2" value="UL_DL"/>
-    </path>
-
-    <path name="low-latency-recordC">
-        <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1"/>
-    </path>
-
-    <path name="low-latency-recordC usb-headset-mic">
-        <ctl name="EP3 TX Mixer USB_TX" value="1"/>
-    </path>
-
-    <path name="low-latency-recordC bt-mic">
-        <ctl name="EP3 TX Mixer BT_TX" value="1"/>
-    </path>
-
-    <path name="mmap-recordC">
-        <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1"/>
-    </path>
-
-    <path name="mmap-recordC usb-headset-mic">
-        <ctl name="EP2 TX Mixer USB_TX" value="1"/>
-    </path>
-
-    <path name="mmap-recordC bt-mic">
-        <ctl name="EP2 TX Mixer BT_TX" value="1"/>
-    </path>
-
-    <!-- codec setting -->>
-    <!-- Rx device -->
-    <path name="handset">
-        <ctl name="PCM Source" value="ASP"/>
-        <ctl name="AMP PCM Gain" value="6"/>
-        <ctl name="Main AMP Enable Switch" value="1"/>
-    </path>
-
-    <path name="voice-handset">
-        <ctl name="Boost Peak Current Limit" value="3.50A"/>
-        <ctl name="PCM Source" value="ASP"/>
-        <ctl name="AMP PCM Gain" value="10"/>
-        <ctl name="Main AMP Enable Switch" value="1"/>
-    </path>
-
-    <path name="voice-hac">
-        <path name="voice-handset"/>
-        <ctl name="AMP PCM Gain" value="5"/>
-    </path>
-
-    <path name="voice-hac-handset">
-    </path>
-
-    <path name="speaker">
-        <ctl name="Boost Peak Current Limit" value="3.50A"/>
-        <ctl name="R Boost Peak Current Limit" value="3.50A"/>
-        <ctl name="Main AMP Enable Switch" value="1"/>
-        <ctl name="R Main AMP Enable Switch" value="1"/>
-    </path>
-
-    <path name="speaker-post">
-        <!-- load Bypass FIR -->
-        <ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
-        <ctl name="Fast Use Case Switch Enable" value="1" />
-        <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-        <ctl name="R Fast Use Case Switch Enable" value="1" />
-    </path>
-
-    <path name="hdmi">
-    </path>
-
-    <path name="hdmi-post">
-    </path>
-
-    <path name="voice-speaker">
-        <ctl name="R Boost Peak Current Limit" value="3.50A"/>
-        <ctl name="Boost Peak Current Limit" value="3.50A"/>
-        <ctl name="ASPTX1 Slot Position" value="1"/>
-        <ctl name="R ASPTX1 Slot Position" value="0"/>
-    <!--<ctl name="R DSP RX2 Source" value="ASPRX2"/>-->
-        <ctl name="R Main AMP Enable Switch" value="1"/>
-        <ctl name="Main AMP Enable Switch" value="1"/>
-        <ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
-        <ctl name="Fast Use Case Switch Enable" value="1" />
-        <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
-        <ctl name="R Fast Use Case Switch Enable" value="1" />
-    </path>
-
-    <path name="voice-speaker-post">
-    </path>
-
-    <path name="voice-dual-speaker">
-        <!-- Speaker Separation -->
-        <path name="voice-speaker" />
-        <path name="voice-speaker-post" />
-    </path>
-
-    <path name="speaker-safe">
-        <ctl name="R Boost Peak Current Limit" value="3.50A"/>
-        <ctl name="R Main AMP Enable Switch" value="1"/>
-    </path>
-
-    <path name="speaker-safe-post">
-        <!-- load Bypass FIR -->
-        <!--ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
-        <ctl name="R Fast Use Case Switch Enable" value="1" /-->
-    </path>
-
-    <path name="usb-tty-full">
-    </path>
-
-    <path name="usb-tty-hco">
-    </path>
-
-    <path name="usb-tty-vco">
-    </path>
-
-    <!-- Tx device -->
-    <path name="handset-mic">
-        <ctl name="Mic Spatial Module Enable" value="1"/>
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-    </path>
-
-    <path name="handset-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
-    </path>
-
-    <path name="voice-handset-mic">
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
-    </path>
-
-    <path name="voice-handset-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-    </path>
-
-    <path name="speaker-mic">
-        <ctl name="Mic Spatial Module Enable" value="1"/>
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-    </path>
-
-    <path name="speaker-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
-    </path>
-
-    <path name="voice-speaker-mic">
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="MIC HW Gain At High Power Mode (cB)" value="130"/>
-    </path>
-
-    <path name="voice-speaker-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-    </path>
-
-    <path name="camcorder-mic">
-        <ctl name="Mic Spatial Module Enable" value="1"/>
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-    </path>
-
-    <path name="camcorder-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-    </path>
-
-    <path name="voice-recog-mic">
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-    </path>
-
-    <path name="voice-recog-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="22"/>
-    </path>
-
-    <path name="voice-recog-aec-mic">
-        <ctl name="Audio Capture Eraser Enable" value="1"/>
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-        <ctl name="Audio Capture Mic Source" value="ERASER"/>
-    </path>
-
-    <path name="voice-recog-aec-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-    </path>
-
-    <path name="unprocessed-mic">
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-    </path>
-
-    <path name="unprocessed-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
-    </path>
-
-    <path name="unprocessed-dual-mic">
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-    </path>
-
-    <path name="unprocessed-dual-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
-    </path>
-
-    <path name="unprocessed-triple-mic">
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="MIC DC Blocker" value="1"/>
-    </path>
-
-    <path name="unprocessed-triple-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="5"/>
-    </path>
-
-    <path name="ultrasound-mic">
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0"/>
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="1"/>
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="2"/>
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
-    </path>
-
-    <path name="ultrasound-mic-post">
-    </path>
-
-    <path name="bt-mic">
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="Audio Capture Mic Source" value="BT_MIC"/>
-        <ctl name="Voice Call Mic Source" value="BT_MIC"/>
-    </path>
-
-    <path name="bt-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-    </path>
-
-    <path name="usb-headset-mic">
-        <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="2"/>
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
-        <ctl name="Audio Capture Mic Source" value="USB_MIC"/>
-        <ctl name="Voice Call Mic Source" value="USB_MIC"/>
-    </path>
-
-    <path name="usb-headset-mic-post">
-        <ctl name="MIC Record Soft Gain (dB)" value="0"/>
-    </path>
-
-    <!-- cs35l41 specific path to load firmware in cs35l41.c -->
-    <path name="cs35l41-load-protection-firmware-start">
-        <!-- Enable it after get the protection firmware -->
-        <ctl name="DSP Booted" value="0" />
-        <ctl name="R DSP Booted" value="0" />
-        <ctl name="DSP1 Preload Switch" value="0" />
-        <ctl name="R DSP1 Preload Switch" value="0" />
-    </path>
-
-    <path name="cs35l41-load-protection-firmware-end">
-        <!-- Enable it after get the protection firmware -->
-        <ctl name="DSP1 Preload Switch" value="1" />
-        <ctl name="R DSP1 Preload Switch" value="1" />
-    </path>
-    <!-- cs35l41 specific path to load firmware in cs35l41.c end-->
-</mixer>
--- a/audio/comet/config/mixer_paths_factory.xml
+++ b/audio/comet/config/mixer_paths_factory.xml
@@ -1,470 +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="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="MIC0" value="0" />
-    <ctl name="MIC1" value="0" />
-    <ctl name="MIC2" value="0" />
-    <ctl name="MIC3" value="0" />
-    <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_ON" />
-
-    <ctl name="TDM_0_RX Mixer US" value="0" />
-    <ctl name="US Record Enable" value="0" />
-    <ctl name="ASPRX1 Slot Position" value="0"/>
-    <ctl name="R ASPRX1 Slot Position" value="1"/>
-
-    <ctl name="USB Card" value="1"/>
-    <ctl name="USB Device" value="0"/>
-    <ctl name="USB Direction" value="0" />
-    <ctl name="USB Memory Config" value="0" />
-
-    <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 EP ID v2" value="1" />
-        <ctl name="USB Capture FORMAT v2" value="1" />
-        <ctl name="USB Config To AoC v2" value="1"/>
-        <ctl name="USB Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
-        <ctl name="USB Direction" value="1" />
-        <ctl name="USB Memory Config" value="1" />
-        <ctl name="EP1 TX Mixer USB_TX" value="1"/>
-    </path>
-
-    <path name="us-mfg-record">
-        <ctl name="US Record Enable" value="1" />
-        <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
-    </path>
-
-    <path name="mic1-status">
-        <ctl name="MIC0" value="1" />
-    </path>
-
-    <path name="mic2-status">
-        <ctl name="MIC1" value="1" />
-    </path>
-
-    <path name="mic3-status">
-        <ctl name="MIC2" value="1" />
-    </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="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="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="MIC0" 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="1" />
-        <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="MIC1" 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="MIC2" 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="1" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
-        <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC0" value="1" />
-        <ctl name="MIC1" value="1" />
-        <ctl name="MIC2" value="1" />
-        <ctl name="MIC3" value="0" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="us-mic1-only">
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC0" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="us-mic2-only">
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="1" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC1" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="us-mic3-only">
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="2" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="-1" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC2" value="1" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="us-mic-all">
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="1" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="2" />
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1" />
-        <ctl name="MIC0" value="1" />
-        <ctl name="MIC1" value="1" />
-        <ctl name="MIC2" value="1" />
-        <ctl name="MIC3" value="0" />
-        <ctl name="MIC Record Soft Gain (dB)" value="0" />
-    </path>
-
-    <path name="cs35l41-us-config-1">
-        <ctl name="ASPRX1 Slot Position" value="2"/>
-    </path>
-
-    <path name="cs35l41-us-config-2">
-        <ctl name="R ASPRX1 Slot Position" value="2"/>
-    </path>
-
-    <path name="cs35l41-us-config-all">
-        <ctl name="ASPRX1 Slot Position" value="2"/>
-        <ctl name="R ASPRX1 Slot Position" value="2"/>
-    </path>
-
-    <path name="amp_iv-only">
-        <ctl name="R ASPTX1 Slot Position" value="2" />
-        <ctl name="R ASPTX2 Slot Position" value="3" />
-        <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="4" />
-        <ctl name="ASPTX4 Slot Position" value="5" />
-        <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="ASPRX1" />
-        <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="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="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="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="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="us-amp_iv-only">
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <path name="amp_iv-only" />
-    </path>
-
-    <path name="us-amp_iv1-only">
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <path name="amp_iv1-only" />
-    </path>
-
-    <path name="us-amp_iv2-only">
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <path name="amp_iv2-only" />
-    </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="speaker1-gain">
-        <ctl name="AMP PCM Gain" />
-    </path>
-
-    <path name="speaker2-gain">
-        <ctl name="R AMP PCM Gain" />
-    </path>
-
-    <path name="usb-playback-gain">
-        <ctl name="Headset Playback Volume" />
-    </path>
-
-    <path name="mfg-playback speaker-1">
-        <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" />
-    </path>
-
-    <path name="mfg-playback speaker-2">
-        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
-        <ctl name="TDM_0_RX Mixer EP3" value="1" />
-        <ctl name="R ASPRX1 Slot Position" value="1" />
-    </path>
-
-    <path name="mfg-playback speaker-all">
-        <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" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-1">
-        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
-        <ctl name="TDM_0_RX Mixer EP6" value="1" />
-        <ctl name="ASPRX1 Slot Position" value="0" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-2">
-        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
-        <ctl name="TDM_0_RX Mixer EP6" value="1" />
-        <ctl name="R ASPRX1 Slot Position" value="1" />
-    </path>
-
-    <path name="deep-buffer-playback speaker-all">
-        <ctl name="AoC Speaker Mixer ASP Mode" value="ASP_BYPASS" />
-        <ctl name="TDM_0_RX Mixer EP6" value="1" />
-        <ctl name="ASPRX1 Slot Position" value="0" />
-        <ctl name="R ASPRX1 Slot Position" 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 Playback EP ID v2" value="1" />
-        <ctl name="USB Capture EP ID v2" value="0" />
-        <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 Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
-        <ctl name="USB Direction" value="0" />
-        <ctl name="USB Memory Config" value="1" />
-        <ctl name="USB_RX Mixer EP3" value="1" />
-    </path>
-
-    <path name="us-mfg-playback speaker-1">
-        <path name="cs35l41-us-config-1" />
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_RX Mixer US" value="1" />
-    </path>
-
-    <path name="us-mfg-playback speaker-2">
-        <path name="cs35l41-us-config-2" />
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_RX Mixer US" value="1" />
-    </path>
-
-    <path name="us-mfg-playback speaker-all">
-        <path name="cs35l41-us-config-all" />
-        <ctl name="TDM_0_RX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_TX Sample Rate" value="SR_96K" />
-        <ctl name="TDM_0_RX Mixer US" value="1" />
-    </path>
-
-    <path name="speaker1-only">
-        <ctl name="AMP PCM Gain" value="17" />
-        <ctl name="PCM Source" value="ASP" />
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="speaker2-only">
-        <ctl name="R AMP PCM Gain" value="17" />
-        <ctl name="R PCM Source" value="ASP" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="us-speaker1-only">
-        <ctl name="PCM Source" value="ASP" />
-        <ctl name="Main AMP Enable Switch" value="1" />
-    </path>
-
-    <path name="us-speaker2-only">
-        <ctl name="R PCM Source" value="ASP" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </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" />
-    </path>
-
-    <path name="us-speaker-all">
-        <ctl name="PCM Source" value="ASP" />
-        <ctl name="Main AMP Enable Switch" value="1" />
-        <ctl name="R PCM Source" value="ASP" />
-        <ctl name="R Main AMP Enable Switch" value="1" />
-    </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 Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
-        <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 Card" value="1"/>
-        <ctl name="USB Device" value="0"/>
-        <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-speaker1" value="EP3 playback (*)"/>
-    <pcm_id name="loopback-speaker2" 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/comet/config/sound_trigger_configuration.xml
+++ b/audio/comet/config/sound_trigger_configuration.xml
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- Copyright (c) 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.                          -->
-<sound_trigger_hal_configuration>
-    <supported_model>
-        <model name="CLIENT_HOTWORD" uuid="7038ddc8-30f2-11e6-b0ac-40a8f03d3f15" model_type="keyphrase" bargein="true"/>
-        <model name="CLIENT_AMBIENT_MUSIC" uuid="9f6ad62a-1f0b-11e7-87c5-40a8f03d3f15" model_type="generic" bargein="false"/>
-        <model name="CLIENT_AMBIENT_MUSIC_BREAK" uuid="12caddb1-acdb-4dce-8cb0-2e95a2313aee" model_type="generic" bargein="false"/>
-    </supported_model>
-</sound_trigger_hal_configuration>
--- a/audio/comet/factory-audio-tables.mk
+++ b/audio/comet/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 := comet
-
-# Mixer Path Configuration for Audio Factory
-PRODUCT_COPY_FILES += \
-    device/google/comet/audio/$(AUDIO_FACTORY_TABLE_FOLDER)/config/mixer_paths_factory.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_factory.xml
-
--- a/audio/comet/prebuilt/libspeechenhancer/Android.bp
+++ b/audio/comet/prebuilt/libspeechenhancer/Android.bp
@@ -1,43 +0,0 @@
-// 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.
-// 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.
-soong_namespace {
-}
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-cc_prebuilt_library_shared {
-    name: "libspeechenhancer",
-    vendor: true,
-    owner: "google",
-    proprietary: true,
-    allow_undefined_symbols: true,
-    arch: {
-        arm64: {
-            srcs: ["arm64/libspeechenhancer.so"],
-        },
-    },
-
-    shared_libs: [
-        "libcutils",
-        "libEGL",
-        "libGLESv2",
-        "libbinder_ndk",
-        "liblog",
-        "libsync",
-        "libz",
-        "libnativewindow",
-    ],
-}
--- a/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so
+++ b/audio/comet/prebuilt/libspeechenhancer/arm64/libspeechenhancer.so
--- a/audio/comet/tuning/Android.bp
+++ b/audio/comet/tuning/Android.bp
@@ -42,18 +42,6 @@ prebuilt_etc {
    defaults: ["aoc_defaults"],
 }

-prebuilt_etc {
-    name: "template.xml",
-    src: "bluenote/template.xml",
-    defaults: ["aoc_defaults"],
-}
-
-prebuilt_etc {
-    name: "tuning_constraints_combination.xml",
-    src: "bluenote/tuning_constraints_combination.xml",
-    defaults: ["aoc_defaults"],
-}
-
 prebuilt_etc {
    name: "compens_spk_l_1.conf",
    src: "compensation/compens_spk_l_1.conf",
@@ -84,48 +72,24 @@ prebuilt_etc {
    defaults: ["aoc_defaults"],
 }

-prebuilt_etc {
-    name: "BLUETOOTH.mods",
-    src: "fortemedia/BLUETOOTH.mods",
-    defaults: ["aoc_defaults"],
-}
-
 prebuilt_etc {
    name: "HANDSFREE.dat",
    src: "fortemedia/HANDSFREE.dat",
    defaults: ["aoc_defaults"],
 }

-prebuilt_etc {
-    name: "HANDSFREE.mods",
-    src: "fortemedia/HANDSFREE.mods",
-    defaults: ["aoc_defaults"],
-}
-
 prebuilt_etc {
    name: "HANDSET.dat",
    src: "fortemedia/HANDSET.dat",
    defaults: ["aoc_defaults"],
 }

-prebuilt_etc {
-    name: "HANDSET.mods",
-    src: "fortemedia/HANDSET.mods",
-    defaults: ["aoc_defaults"],
-}
-
 prebuilt_etc {
    name: "HEADSET.dat",
    src: "fortemedia/HEADSET.dat",
    defaults: ["aoc_defaults"],
 }

-prebuilt_etc {
-    name: "HEADSET.mods",
-    src: "fortemedia/HEADSET.mods",
-    defaults: ["aoc_defaults"],
-}
-
 prebuilt_etc {
    name: "mcps.dat",
    src: "fortemedia/mcps.dat",
@@ -252,12 +216,6 @@ prebuilt_etc {
    soc_specific: true,
 }

-prebuilt_etc {
-    name: "speaker_post_processing_volume_spec.xml",
-    src: "pts/speaker_post_processing_volume_spec.xml",
-    defaults: ["aoc_defaults"],
-}
-
 prebuilt_etc {
    name: "waves_config_nx.ini",
    src: "waves/waves_config_nx.ini",
@@ -270,18 +228,6 @@ prebuilt_etc {
    soc_specific: true,
 }

-prebuilt_etc {
-    name: "test_config.ini",
-    src: "waves/tests/test_config.ini",
-    soc_specific: true,
-}
-
-prebuilt_etc {
-    name: "test_preset.mps",
-    src: "waves/tests/test_preset.mps",
-    soc_specific: true,
-}
-
 prebuilt_etc {
    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
    src: "spatializer/base",
--- a/audio/comet/tuning/apmg3/downlink_handset_config.pb
+++ b/audio/comet/tuning/apmg3/downlink_handset_config.pb
--- a/audio/comet/tuning/apmg3/downlink_handset_hac_config.pb
+++ b/audio/comet/tuning/apmg3/downlink_handset_hac_config.pb
--- a/audio/comet/tuning/apmg3/downlink_speaker_config.pb
+++ b/audio/comet/tuning/apmg3/downlink_speaker_config.pb
--- a/audio/comet/tuning/apmg3/uplink_handset_hac_aec_off_config.pb
+++ b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_off_config.pb
--- a/audio/comet/tuning/apmg3/uplink_handset_hac_aec_on_config.pb
+++ b/audio/comet/tuning/apmg3/uplink_handset_hac_aec_on_config.pb
--- a/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb
+++ b/audio/comet/tuning/apmg3/uplink_speaker_aec_on_config.pb
--- a/audio/comet/tuning/bluenote/template.xml
+++ b/audio/comet/tuning/bluenote/template.xml
@@ -1,488 +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="releaseTime" type="uint32"/>
-      <param id="22" name="attackTime" 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 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="0.0" name="CB_alpha_lowband" type="float"/>
-        <param default="0.0" name="CB_alpha_midband" type="float"/>
-        <param default="0.0" name="CB_alpha_highband" type="float"/>
-      </struct>
-      <struct id="33">
-        <param default="0.0" name="CB_epsilon_lowband" type="float"/>
-        <param default="0.0" name="CB_epsilon_midband" type="float"/>
-        <param default="0.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>
-      <struct id="35">
-        <param name="IIR_lowpass" size="5" type="float"/>
-        <param name="IIR_highpass" size="5" 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="257" 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"/>
-      <param id="23" name="BIN_THRESHOLD" size="5" type="uint32"/>
-    </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"/>
-      <param default="450" id="74" name="GAIN_SMOOTHING_FACTOR" type="int32"/>
-      <param default="150" id="75" name="FINAL_GAIN_SMOOTHING_OFFSET_FACTOR" type="int32"/>
-      <param default="1" id="76" name="MUL_CH_SPEC_DIFF_ENABLE" type="int32"/>
-      <param default="4" id="77" name="MUL_CH_SPEC_DIFF_CENTER_SPEC_SEL" type="int32"/>
-      <param default="1000" id="78" name="MUL_CH_SPEC_DIFF_WIENER_OVERDRIVE" type="int32"/>
-      <param default="2" id="79" name="MUL_CH_SPEC_DIFF_GAIN_COMB" type="int32"/>
-      <param default="900" id="80" name="MUL_CH_SPEC_DIFF_TIME_SMOOTH" 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="40" name="Pixel Gain Controller">
-      <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 name="crossover_iir_lp1" size="5" type="float"/>
-        <param name="crossover_iir_hp1" size="5" type="float"/>
-        <param name="crossover_iir_lp2" size="5" type="float"/>
-        <param name="crossover_iir_hp2" size="5" type="float"/>
-        <param default="250" max="1000" min="5" name="environment_rms_window_ms" type="int32"/>
-        <param default="-40" max="0" name="environment_rms_threshold_db" type="float"/>
-        <param default="50" min="0" name="environment_low_to_high_ms" type="int32"/>
-        <param default="1" min="0" name="environment_loudness_ratio_band0" type="float"/>
-        <param default="1" min="0" name="environment_loudness_ratio_band1" type="float"/>
-        <param default="1" min="0" name="environment_loudness_ratio_band2" type="float"/>
-        <param default="100" max="1000" min="5" name="drc_window_ms_lowaop_band0" type="int32"/>
-        <param default="28" name="drc_gain_db_lowaop_band0" type="float"/>
-        <param default="-20" name="drc_min_gain_db_lowaop_band0" type="float"/>
-        <param default="-70" name="drc_thres_db_expander_lowaop_band0" type="float"/>
-        <param default="-40" name="drc_thres_db_upward_compressor_lowaop_band0" type="float"/>
-        <param default="-36" name="drc_thres_db_downward_compressor_lowaop_band0" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_expander_lowaop_band0" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_upward_compressor_lowaop_band0" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_downward_compressor_lowaop_band0" type="float"/>
-        <param default="2.0" min="0" name="drc_ratio_expander_lowaop_band0" type="float"/>
-        <param default="1.5" min="0" name="drc_ratio_upward_compressor_lowaop_band0" type="float"/>
-        <param default="1.0" min="0" name="drc_ratio_linear_lowaop_band0" type="float"/>
-        <param default="9.0" min="0" name="drc_ratio_downward_compressor_lowaop_band0" type="float"/>
-        <param default="350" min="0" name="drc_attack_ms_expander_lowaop_band0" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_upward_compressor_lowaop_band0" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_linear_lowaop_band0" type="float"/>
-        <param default="350" min="0" name="drc_attack_ms_downward_compressor_lowaop_band0" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_expander_lowaop_band0" type="float"/>
-        <param default="12000" min="0" name="drc_release_ms_upward_compressor_lowaop_band0" type="float"/>
-        <param default="12000" min="0" name="drc_release_ms_linear_lowaop_band0" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_downward_compressor_lowaop_band0" type="float"/>
-        <param default="100" max="1000" min="5" name="drc_window_ms_lowaop_band1" type="int32"/>
-        <param default="28" name="drc_gain_db_lowaop_band1" type="float"/>
-        <param default="-20" name="drc_min_gain_db_lowaop_band1" type="float"/>
-        <param default="-70" name="drc_thres_db_expander_lowaop_band1" type="float"/>
-        <param default="-40" name="drc_thres_db_upward_compressor_lowaop_band1" type="float"/>
-        <param default="-36" name="drc_thres_db_downward_compressor_lowaop_band1" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_expander_lowaop_band1" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_upward_compressor_lowaop_band1" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_downward_compressor_lowaop_band1" type="float"/>
-        <param default="2.0" min="0" name="drc_ratio_expander_lowaop_band1" type="float"/>
-        <param default="1.5" min="0" name="drc_ratio_upward_compressor_lowaop_band1" type="float"/>
-        <param default="1.0" min="0" name="drc_ratio_linear_lowaop_band1" type="float"/>
-        <param default="9.0" min="0" name="drc_ratio_downward_compressor_lowaop_band1" type="float"/>
-        <param default="350" min="0" name="drc_attack_ms_expander_lowaop_band1" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_upward_compressor_lowaop_band1" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_linear_lowaop_band1" type="float"/>
-        <param default="350" min="0" name="drc_attack_ms_downward_compressor_lowaop_band1" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_expander_lowaop_band1" type="float"/>
-        <param default="12000" min="0" name="drc_release_ms_upward_compressor_lowaop_band1" type="float"/>
-        <param default="12000" min="0" name="drc_release_ms_linear_lowaop_band1" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_downward_compressor_lowaop_band1" type="float"/>
-        <param default="100" max="1000" min="5" name="drc_window_ms_lowaop_band2" type="int32"/>
-        <param default="28" name="drc_gain_db_lowaop_band2" type="float"/>
-        <param default="-20" name="drc_min_gain_db_lowaop_band2" type="float"/>
-        <param default="-70" name="drc_thres_db_expander_lowaop_band2" type="float"/>
-        <param default="-40" name="drc_thres_db_upward_compressor_lowaop_band2" type="float"/>
-        <param default="-36" name="drc_thres_db_downward_compressor_lowaop_band2" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_expander_lowaop_band2" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_upward_compressor_lowaop_band2" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_downward_compressor_lowaop_band2" type="float"/>
-        <param default="2.0" min="0" name="drc_ratio_expander_lowaop_band2" type="float"/>
-        <param default="1.5" min="0" name="drc_ratio_upward_compressor_lowaop_band2" type="float"/>
-        <param default="1.0" min="0" name="drc_ratio_linear_lowaop_band2" type="float"/>
-        <param default="9.0" min="0" name="drc_ratio_downward_compressor_lowaop_band2" type="float"/>
-        <param default="350" min="0" name="drc_attack_ms_expander_lowaop_band2" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_upward_compressor_lowaop_band2" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_linear_lowaop_band2" type="float"/>
-        <param default="350" min="0" name="drc_attack_ms_downward_compressor_lowaop_band2" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_expander_lowaop_band2" type="float"/>
-        <param default="12000" min="0" name="drc_release_ms_upward_compressor_lowaop_band2" type="float"/>
-        <param default="12000" min="0" name="drc_release_ms_linear_lowaop_band2" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_downward_compressor_lowaop_band2" type="float"/>
-        <param default="100" max="1000" min="5" name="drc_window_ms_highaop_band0" type="int32"/>
-        <param default="28" name="drc_gain_db_highaop_band0" type="float"/>
-        <param default="-20" name="drc_min_gain_db_highaop_band0" type="float"/>
-        <param default="-70" name="drc_thres_db_expander_highaop_band0" type="float"/>
-        <param default="-40" name="drc_thres_db_upward_compressor_highaop_band0" type="float"/>
-        <param default="-36" name="drc_thres_db_downward_compressor_highaop_band0" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_expander_highaop_band0" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_upward_compressor_highaop_band0" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_downward_compressor_highaop_band0" type="float"/>
-        <param default="2.5" min="0" name="drc_ratio_expander_highaop_band0" type="float"/>
-        <param default="1.5" min="0" name="drc_ratio_upward_compressor_highaop_band0" type="float"/>
-        <param default="1.0" min="0" name="drc_ratio_linear_highaop_band0" type="float"/>
-        <param default="9.0" min="0" name="drc_ratio_downward_compressor_highaop_band0" type="float"/>
-        <param default="80" min="0" name="drc_attack_ms_expander_highaop_band0" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_upward_compressor_highaop_band0" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_linear_highaop_band0" type="float"/>
-        <param default="80" min="0" name="drc_attack_ms_downward_compressor_highaop_band0" type="float"/>
-        <param default="8000" min="0" name="drc_release_ms_expander_highaop_band0" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_upward_compressor_highaop_band0" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_linear_highaop_band0" type="float"/>
-        <param default="8000" min="0" name="drc_release_ms_downward_compressor_highaop_band0" type="float"/>
-        <param default="100" max="1000" min="5" name="drc_window_ms_highaop_band1" type="int32"/>
-        <param default="28" name="drc_gain_db_highaop_band1" type="float"/>
-        <param default="-20" name="drc_min_gain_db_highaop_band1" type="float"/>
-        <param default="-70" name="drc_thres_db_expander_highaop_band1" type="float"/>
-        <param default="-40" name="drc_thres_db_upward_compressor_highaop_band1" type="float"/>
-        <param default="-36" name="drc_thres_db_downward_compressor_highaop_band1" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_expander_highaop_band1" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_upward_compressor_highaop_band1" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_downward_compressor_highaop_band1" type="float"/>
-        <param default="2.5" min="0" name="drc_ratio_expander_highaop_band1" type="float"/>
-        <param default="1.5" min="0" name="drc_ratio_upward_compressor_highaop_band1" type="float"/>
-        <param default="1.0" min="0" name="drc_ratio_linear_highaop_band1" type="float"/>
-        <param default="6.0" min="0" name="drc_ratio_downward_compressor_highaop_band1" type="float"/>
-        <param default="80" min="0" name="drc_attack_ms_expander_highaop_band1" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_upward_compressor_highaop_band1" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_linear_highaop_band1" type="float"/>
-        <param default="80" min="0" name="drc_attack_ms_downward_compressor_highaop_band1" type="float"/>
-        <param default="8000" min="0" name="drc_release_ms_expander_highaop_band1" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_upward_compressor_highaop_band1" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_linear_highaop_band1" type="float"/>
-        <param default="8000" min="0" name="drc_release_ms_downward_compressor_highaop_band1" type="float"/>
-        <param default="100" max="1000" min="5" name="drc_window_ms_highaop_band2" type="int32"/>
-        <param default="28" name="drc_gain_db_highaop_band2" type="float"/>
-        <param default="-20" name="drc_min_gain_db_highaop_band2" type="float"/>
-        <param default="-70" name="drc_thres_db_expander_highaop_band2" type="float"/>
-        <param default="-40" name="drc_thres_db_upward_compressor_highaop_band2" type="float"/>
-        <param default="-36" name="drc_thres_db_downward_compressor_highaop_band2" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_expander_highaop_band2" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_upward_compressor_highaop_band2" type="float"/>
-        <param default="4.0" min="0" name="drc_knee_width_db_downward_compressor_highaop_band2" type="float"/>
-        <param default="2.5" min="0" name="drc_ratio_expander_highaop_band2" type="float"/>
-        <param default="1.5" min="0" name="drc_ratio_upward_compressor_highaop_band2" type="float"/>
-        <param default="1.0" min="0" name="drc_ratio_linear_highaop_band2" type="float"/>
-        <param default="9.0" min="0" name="drc_ratio_downward_compressor_highaop_band2" type="float"/>
-        <param default="80" min="0" name="drc_attack_ms_expander_highaop_band2" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_upward_compressor_highaop_band2" type="float"/>
-        <param default="500" min="0" name="drc_attack_ms_linear_highaop_band2" type="float"/>
-        <param default="80" min="0" name="drc_attack_ms_downward_compressor_highaop_band2" type="float"/>
-        <param default="8000" min="0" name="drc_release_ms_expander_highaop_band2" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_upward_compressor_highaop_band2" type="float"/>
-        <param default="5000" min="0" name="drc_release_ms_linear_highaop_band2" type="float"/>
-        <param default="8000" min="0" name="drc_release_ms_downward_compressor_highaop_band2" type="float"/>
-        <param default="100" max="100" min="0" name="drc_delay_ms" type="int32"/>
-        <param default="1" max="1" min="0" name="drc_use_peak_amplitude" type="int32"/>
-        <param default="0" max="100" min="-100" name="drc_band1_minus_band2_max_gain_db" type="float"/>
-        <param default="0" max="100" min="-100" name="drc_band3_minus_band2_max_gain_db" type="float"/>
-        <param default="20" max="20" min="0" name="limiter_delay_ms" type="int32"/>
-        <param default="-0.5" max="0" name="limiter_thres_db" type="float"/>
-        <param default="0" name="limiter_gain_db" type="float"/>
-        <param default="10" min="0" name="limiter_attack_time_ms" type="int32"/>
-        <param default="50" min="0" name="limiter_release_time_ms" type="int32"/>
-        <param default="1000" max="10000" min="100" name="drc_long_term_window_lower_ms_band0" type="int32"/>
-        <param default="1000" max="10000" min="100" name="drc_long_term_window_lower_ms_band1" type="int32"/>
-        <param default="1000" max="10000" min="100" name="drc_long_term_window_lower_ms_band2" type="int32"/>
-        <param default="5000" max="10000" min="100" name="drc_long_term_window_upper_ms_band0" type="int32"/>
-        <param default="5000" max="10000" min="100" name="drc_long_term_window_upper_ms_band1" type="int32"/>
-        <param default="5000" max="10000" min="100" name="drc_long_term_window_upper_ms_band2" type="int32"/>
-        <param default="-50" name="drc_long_term_window_lower_db_band0" type="float"/>
-        <param default="-50" name="drc_long_term_window_lower_db_band1" type="float"/>
-        <param default="-50" name="drc_long_term_window_lower_db_band2" type="float"/>
-        <param default="-30" name="drc_long_term_window_upper_db_band0" type="float"/>
-        <param default="-30" name="drc_long_term_window_upper_db_band1" type="float"/>
-        <param default="-30" name="drc_long_term_window_upper_db_band2" type="float"/>
-        <param default="10000" min="0" name="environment_high_to_low_ms" type="int32"/>
-      </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="345" name="chre_aec_timeout" type="uint32"/>
-      <param id="346" name="chre_pdm_gain" type="int32"/>
-      <param id="347" name="chre_aec_gain" type="int32"/>
-    </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="40"/>
-      </block>
-    </signalflow>
-    <signalflow id="2" name="General Mic Recording">
-      <block id="137">
-        <moduleRef id="14"/>
-        <moduleRef id="11"/>
-        <moduleRef id="7"/>
-        <moduleRef id="5"/>
-        <moduleRef id="40"/>
-      </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/comet/tuning/bluenote/tuning_constraints_combination.xml
+++ b/audio/comet/tuning/bluenote/tuning_constraints_combination.xml
--- a/audio/comet/tuning/fortemedia/BLUETOOTH.dat
+++ b/audio/comet/tuning/fortemedia/BLUETOOTH.dat
--- a/audio/comet/tuning/fortemedia/BLUETOOTH.mods
+++ b/audio/comet/tuning/fortemedia/BLUETOOTH.mods
--- a/audio/comet/tuning/fortemedia/HANDSET.dat
+++ b/audio/comet/tuning/fortemedia/HANDSET.dat
--- a/audio/comet/tuning/fortemedia/HANDSET.mods
+++ b/audio/comet/tuning/fortemedia/HANDSET.mods
--- a/audio/comet/tuning/fortemedia/HANDSFREE.dat
+++ b/audio/comet/tuning/fortemedia/HANDSFREE.dat
--- a/audio/comet/tuning/fortemedia/HANDSFREE.mods
+++ b/audio/comet/tuning/fortemedia/HANDSFREE.mods
--- a/audio/comet/tuning/fortemedia/HEADSET.dat
+++ b/audio/comet/tuning/fortemedia/HEADSET.dat
--- a/audio/comet/tuning/fortemedia/HEADSET.mods
+++ b/audio/comet/tuning/fortemedia/HEADSET.mods
--- a/audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml
+++ b/audio/comet/tuning/pts/speaker_post_processing_volume_spec.xml
@@ -1,114 +0,0 @@
-<?xml version="1.0" ?>
-<xml>
-    <spec feature="normal" device_state="OPENED">
-        <vol step="1">-55.3429,-56.462852</vol>
-        <vol step="2">-51.476486,-52.629974</vol>
-        <vol step="3">-47.429344,-48.577915</vol>
-        <vol step="4">-44.404938,-45.54104</vol>
-        <vol step="5">-41.34484,-42.47274</vol>
-        <vol step="6">-38.26381,-39.386524</vol>
-        <vol step="7">-35.17891,-36.297333</vol>
-        <vol step="8">-32.07109,-33.184692</vol>
-        <vol step="9">-30.30139,-31.407984</vol>
-        <vol step="10">-28.531578,-29.626408</vol>
-        <vol step="11">-26.762623,-27.840538</vol>
-        <vol step="12">-24.994268,-26.05007</vol>
-        <vol step="13">-23.22528,-24.253963</vol>
-        <vol step="14">-21.460478,-22.458183</vol>
-        <vol step="15">-19.69938,-20.66309</vol>
-        <vol step="16">-17.927505,-18.85597</vol>
-        <vol step="17">-16.149855,-17.04668</vol>
-        <vol step="18">-14.375043,-15.242476</vol>
-        <vol step="19">-12.619692,-13.460893</vol>
-        <vol step="20">-10.988443,-11.807947</vol>
-        <vol step="21">-10.229917,-11.031332</vol>
-        <vol step="22">-10.067055,-10.8566475</vol>
-        <vol step="23">-10.010124,-10.794648</vol>
-        <vol step="24">-9.965792,-10.748672</vol>
-        <vol step="25">-9.924187,-10.708454</vol>
-    </spec>
-
-    <spec feature="normal" device_state="CLOSED">
-        <vol step="1">-56.824966,-56.22085</vol>
-        <vol step="2">-53.00812,-52.39601</vol>
-        <vol step="3">-48.99447,-48.376297</vol>
-        <vol step="4">-45.98986,-45.365585</vol>
-        <vol step="5">-42.94967,-42.31531</vol>
-        <vol step="6">-39.888924,-39.239597</vol>
-        <vol step="7">-36.825584,-36.154556</vol>
-        <vol step="8">-33.740566,-33.03967</vol>
-        <vol step="9">-31.983803,-31.262745</vol>
-        <vol step="10">-30.226,-29.482727</vol>
-        <vol step="11">-28.46655,-27.69943</vol>
-        <vol step="12">-26.707556,-25.915329</vol>
-        <vol step="13">-24.945498,-24.127829</vol>
-        <vol step="14">-23.18879,-22.34605</vol>
-        <vol step="15">-21.434853,-20.568602</vol>
-        <vol step="16">-19.676136,-18.789795</vol>
-        <vol step="17">-17.923016,-17.019646</vol>
-        <vol step="18">-16.179115,-15.263374</vol>
-        <vol step="19">-14.411232,-13.477808</vol>
-        <vol step="20">-12.608496,-11.657543</vol>
-        <vol step="21">-11.418643,-10.450487</vol>
-        <vol step="22">-11.115015,-10.132849</vol>
-        <vol step="23">-11.049253,-10.054632</vol>
-        <vol step="24">-11.009314,-10.004243</vol>
-        <vol step="25">-10.979197,-9.964965</vol>
-    </spec>
-
-    <spec feature="speaker_spatialization" device_state="OPENED">
-        <vol step="1">-48.656296,-50.673286</vol>
-        <vol step="2">-44.69299,-46.81315</vol>
-        <vol step="3">-40.618153,-42.763763</vol>
-        <vol step="4">-37.65023,-39.806267</vol>
-        <vol step="5">-34.71226,-36.89866</vol>
-        <vol step="6">-31.792694,-34.008415</vol>
-        <vol step="7">-28.87659,-31.105488</vol>
-        <vol step="8">-25.919016,-28.141272</vol>
-        <vol step="9">-24.223642,-26.43234</vol>
-        <vol step="10">-22.520838,-24.709074</vol>
-        <vol step="11">-20.81106,-22.973286</vol>
-        <vol step="12">-19.082249,-21.21807</vol>
-        <vol step="13">-17.333406,-19.4436</vol>
-        <vol step="14">-15.581524,-17.667053</vol>
-        <vol step="15">-13.825251,-15.887933</vol>
-        <vol step="16">-12.092208,-14.131317</vol>
-        <vol step="17">-10.732493,-12.741249</vol>
-        <vol step="18">-10.100718,-12.073996</vol>
-        <vol step="19">-9.911014,-11.864244</vol>
-        <vol step="20">-9.836917,-11.782432</vol>
-        <vol step="21">-9.779734,-11.722244</vol>
-        <vol step="22">-9.734992,-11.677365</vol>
-        <vol step="23">-9.6985,-11.645135</vol>
-        <vol step="24">-9.66777,-11.623802</vol>
-        <vol step="25">-9.63527,-11.600014</vol>
-    </spec>
-
-    <spec feature="speaker_spatialization" device_state="CLOSED">
-        <vol step="1">-51.52192,-50.394104</vol>
-        <vol step="2">-47.673805,-46.551804</vol>
-        <vol step="3">-43.651005,-42.548542</vol>
-        <vol step="4">-40.702824,-39.619167</vol>
-        <vol step="5">-37.78776,-36.72528</vol>
-        <vol step="6">-34.883675,-33.843998</vol>
-        <vol step="7">-31.96994,-30.95195</vol>
-        <vol step="8">-29.008202,-28.005291</vol>
-        <vol step="9">-27.310637,-26.311722</vol>
-        <vol step="10">-25.606598,-24.60886</vol>
-        <vol step="11">-23.898502,-22.899467</vol>
-        <vol step="12">-22.189236,-21.187288</vol>
-        <vol step="13">-20.478073,-19.472952</vol>
-        <vol step="14">-18.775997,-17.768572</vol>
-        <vol step="15">-17.08199,-16.07426</vol>
-        <vol step="16">-15.326209,-14.307854</vol>
-        <vol step="17">-13.593147,-12.561827</vol>
-        <vol step="18">-12.172909,-11.130552</vol>
-        <vol step="19">-11.557884,-10.508577</vol>
-        <vol step="20">-11.353183,-10.2964</vol>
-        <vol step="21">-11.280718,-10.217085</vol>
-        <vol step="22">-11.227874,-10.15811</vol>
-        <vol step="23">-11.186886,-10.110628</vol>
-        <vol step="24">-11.15273,-10.070196</vol>
-        <vol step="25">-11.126692,-10.037739</vol>
-    </spec>
-</xml>
--- a/audio/comet/tuning/waves/tests/test_config.ini
+++ b/audio/comet/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/comet/tuning/waves/tests/test_preset.mps
+++ b/audio/comet/tuning/waves/tests/test_preset.mps
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -22,6 +22,9 @@ AocPowerPinCtrlCheckEnable = true
 # Sar backOff high resolution support
 SarBackOffHighResolution = true

+# Sar BLE Non-connection support
+SarBleNonConnection = true
+
 # Update BQR Event Mask property value
 BqrEventMaskValueUpdate = 295262

--- a/comet/BoardConfig.mk
+++ b/comet/BoardConfig.mk
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-ifeq (,$(filter %comet23,$(PRODUCT_NAME)))

 TARGET_BOARD_INFO_FILE := device/google/comet/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := comet
@@ -29,22 +28,11 @@ RELEASE_GOOGLE_PRODUCT_NTNRADIO_DIR := $(RELEASE_GOOGLE_COMET_NTNRADIO_DIR)
 USES_IDISPLAY_INTF_SEC := true

 include device/google/zumapro/BoardConfig-common.mk
-include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
 include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/comet/proprietary/BoardConfigVendor.mk
 include device/google/comet/sepolicy/comet-sepolicy.mk
 include device/google/comet/wifi/BoardConfig-wifi.mk

-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/6_1/BoardUserdebugModules.mk
-endif
-
-else
-
-include device/google/comet23/comet23/BoardConfig.mk
-
-endif
-
 DEVICE_PATH := device/google/comet
 VENDOR_PATH := vendor/google/comet
 include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
+include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
--- a/comet/BoardConfigEvolution.mk
+++ b/comet/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/comet/device-evolution.mk
+++ b/comet/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/comet/extract-files.py
+++ b/comet/extract-files.py
@@ -28,8 +28,6 @@ from extract_utils.main import (
 namespace_imports = [
    'device/google/comet',
    'hardware/google/av',
-    'hardware/google/gchips',
-    'hardware/google/graphics/common',
    'hardware/google/interfaces',
    'hardware/google/pixel',
 ]
@@ -45,7 +43,7 @@ lib_fixups: lib_fixups_user_type = {
        'com.google.edgetpu_app_service-V4-ndk',
        'com.google.edgetpu_vendor_service-V2-ndk',
        'vendor.google.whitechapel.audio.audioext@4.0',
-        'vendor.google.whitechapel.audio.extension-V4-ndk',
+        'vendor.google.whitechapel.audio.extension-V5-ndk',
    ): lib_fixup_vendor_suffix,
 }

@@ -54,6 +52,12 @@ blob_fixups: blob_fixups_user_type = {
        .patch_file('osaifu-keitai.patch'),
    'vendor/etc/init/init.modem_logging_control.rc': blob_fixup()
        .regex_replace(' && property:ro.debuggable=0', ''),
+    'vendor/lib64/libspeechenhancer.so': blob_fixup()
+        .clear_symbol_version('AHardwareBuffer_allocate')
+        .clear_symbol_version('AHardwareBuffer_describe')
+        .clear_symbol_version('AHardwareBuffer_lock')
+        .clear_symbol_version('AHardwareBuffer_release')
+        .clear_symbol_version('AHardwareBuffer_unlock'),
 }  # fmt: skip

 extract_fns: extract_fns_user_type = {
@@ -79,7 +83,7 @@ def fix_vendor_file_list(file_list: FileList):
        'vendor/lib64/com.google.edgetpu_app_service-V4-ndk.so',
        'vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so',
        'vendor/lib64/vendor.google.whitechapel.audio.audioext@4.0.so',
-        'vendor/lib64/vendor.google.whitechapel.audio.extension-V4-ndk.so',
+        'vendor/lib64/vendor.google.whitechapel.audio.extension-V5-ndk.so',
    ]

    for file_path in module_suffix_file_paths:
--- a/comet/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
+++ b/comet/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2024 The Evolution X Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Android version screen, build maintainer -->
+    <string name="build_maintainer_summary" translatable="false">Anierin Bliss</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://PayPal.me/AnierinB</string>
+</resources>
--- a/comet/overlay/packages/services/Telephony/res/values/config.xml
+++ b/comet/overlay/packages/services/Telephony/res/values/config.xml
@@ -27,6 +27,8 @@
            translatable="false">
        <!-- b/393518741 -->
        <item>cz</item>
+        <item>gr</item>
+        <item>hr</item>
        <item>in</item>
        <item>il</item>
        <item>tw</item>
@@ -45,6 +47,8 @@
        <!-- b/393518741 -->
        <item>cz,01,156</item>
        <item>cz,03,156</item>
+        <item>gr,,100,108,166,199,1056</item>
+        <item>hr,,192,193,194,195,1987</item>
        <item>in,,101,102,103,108</item>
        <item>il,,101,102</item>
        <item>tw,,110,119</item>
--- a/comet/proprietary-files-carriersettings.txt
+++ b/comet/proprietary-files-carriersettings.txt
@@ -9,12 +9,15 @@ 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
@@ -25,13 +28,17 @@ 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
@@ -52,6 +59,7 @@ 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
@@ -101,6 +109,7 @@ 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
@@ -116,6 +125,7 @@ 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
@@ -130,10 +140,12 @@ 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
@@ -141,6 +153,7 @@ 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
@@ -148,9 +161,12 @@ 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
@@ -182,12 +198,15 @@ 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
@@ -195,12 +214,14 @@ 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
@@ -225,6 +246,7 @@ 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
@@ -244,11 +266,15 @@ 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/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
@@ -266,9 +292,11 @@ 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
@@ -362,12 +390,14 @@ 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
@@ -377,8 +407,10 @@ 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
@@ -412,7 +444,9 @@ 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
@@ -421,6 +455,7 @@ 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
--- a/comet/proprietary-files-vendor.txt
+++ b/comet/proprietary-files-vendor.txt
--- a/comet/proprietary-files.txt
+++ b/comet/proprietary-files.txt
@@ -6,9 +6,9 @@
 product/priv-app/SCONE-v45900/SCONE-v45900.apk;PRESIGNED

 # AiAi
-product/priv-app/AICorePrebuilt-aicore_20240509.01_RC02/AICorePrebuilt-aicore_20240509.01_RC02.apk;PRESIGNED
-product/priv-app/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01/DeviceIntelligenceNetworkPrebuilt-U.32_V.7_playstore_astrea_20240725.00_RC01.apk;PRESIGNED
-product/priv-app/DevicePersonalizationPrebuiltPixel2024-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixel2024-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
+product/priv-app/AICorePrebuilt-aicore_20250130.00_RC01/AICorePrebuilt-aicore_20250130.00_RC01.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02/DeviceIntelligenceNetworkPrebuilt-astrea_20240329.00_RC02.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2024-bfinal_aiai_20250217.00_RC08/DevicePersonalizationPrebuiltPixel2024-bfinal_aiai_20250217.00_RC08.apk;PRESIGNED

 # Audio
 product/etc/ambient/matcher_tah.leveldb
@@ -17,9 +17,12 @@ product/etc/firmware/music_detector.sound_model
 product/etc/firmware/music_detector.sound_model_2
 product/etc/firmware/music_detector.sound_model_tflite

+# Camera
+product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIGNED
+
 # Camera extensions
 product/etc/permissions/androidx.camera.extensions.impl.xml
-product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED
+product/priv-app/PixelCameraServicesConnectivityClient/PixelCameraServicesConnectivityClient.apk;PRESIGNED

 # Camera services
 product/etc/permissions/com.google.pixel.camera.connectivity.impl.xml
@@ -44,7 +47,7 @@ product/priv-app/HotwordEnrollmentXGoogleFUSIONPro/HotwordEnrollmentXGoogleFUSIO
 product/etc/sysconfig/allowlist_com.shannon.imsservice.xml

 # Permissions
-product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-lineage.xml
+product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-evolution.xml
 product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml
 product/etc/sysconfig/google-hiddenapi-package-whitelist.xml
 product/etc/sysconfig/nexus.xml
@@ -69,7 +72,7 @@ product/etc/permissions/com.android.sdm.plugins.dcmo.xml
 product/etc/permissions/com.android.sdm.plugins.diagmon.xml
 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_51.0.707712815/CarrierSettings_signed_51.0.707712815.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
@@ -97,11 +100,6 @@ product/priv-app/AppDirectedSMSService/AppDirectedSMSService.apk;PRESIGNED
 product/priv-app/OemDmTrigger/OemDmTrigger.apk
 product/priv-app/WfcActivation/WfcActivation.apk;PRESIGNED

-# system partition
-
-# IMS
-system/bin/oem-iptables-init.sh
-
 # system_ext partition

 # Audio
@@ -152,7 +150,7 @@ system_ext/etc/permissions/com.shannon.rcsservice.xml
 system_ext/lib64/libmediaadaptor.so
 system_ext/lib64/libpixelimsmedia.so
 system_ext/lib64/vendor.google.whitechapel.audio.audioext@4.0.so
-system_ext/lib64/vendor.google.whitechapel.audio.extension-V4-ndk.so
+system_ext/lib64/vendor.google.whitechapel.audio.extension-V5-ndk.so
 system_ext/priv-app/PixelImsMediaService/PixelImsMediaService.apk
 system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk
 system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
@@ -164,7 +162,7 @@ system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml
 system_ext/priv-app/PixelIwlan/PixelIwlan.apk

 # Permissions
-system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml
+system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml

 # Radio
 system_ext/etc/default-permissions/default-permissions-euiccpixel.xml
--- a/comet/skip-files-vendor.txt
+++ b/comet/skip-files-vendor.txt
@@ -23,6 +23,7 @@ bin/cksum
 bin/clear
 bin/cmp
 bin/comm
+bin/copy_efs_files_to_data
 bin/cp
 bin/cpio
 bin/cut
@@ -37,8 +38,9 @@ bin/dos2unix
 bin/du
 bin/dump/dump_aoc
 bin/dump/dump_devfreq
-bin/dump/dump_display
 bin/dump/dump_display_logbuffer
+bin/dump/dump_exynos_display
+bin/dump/dump_exynos_second_display
 bin/dump/dump_fingerprint
 bin/dump/dump_modem
 bin/dump/dump_modemlog
@@ -46,7 +48,6 @@ bin/dump/dump_pcie.sh
 bin/dump/dump_perf
 bin/dump/dump_pixel_metrics
 bin/dump/dump_power
-bin/dump/dump_second_display
 bin/dump/dump_sensors
 bin/dump/dump_soc
 bin/dump/dump_storage
@@ -89,14 +90,11 @@ bin/gzip
 bin/head
 bin/hostname
 bin/hw/android.hardware.boot-service.default-pixel
-bin/hw/android.hardware.composer.hwc3-service.pixel
 bin/hw/android.hardware.drm-service.clearkey
 bin/hw/android.hardware.dumpstate-service
 bin/hw/android.hardware.gatekeeper-service.trusty
-bin/hw/android.hardware.graphics.allocator-V2-service
 bin/hw/android.hardware.health-service.zumapro
 bin/hw/android.hardware.health.storage-service.default
-bin/hw/android.hardware.memtrack-service.pixel
 bin/hw/android.hardware.nfc-service.st
 bin/hw/android.hardware.power-service.pixel-libperfmgr
 bin/hw/android.hardware.power.stats-service.pixel
@@ -170,7 +168,6 @@ bin/paste
 bin/patch
 bin/pgrep
 bin/pidof
-bin/pixelstats-vendor
 bin/pkill
 bin/pmap
 bin/predump_touch.sh
@@ -262,6 +259,10 @@ bin/yes
 bin/zcat
 build.prop
 etc/NOTICE.xml.gz
+etc/aconfig/flag.info
+etc/aconfig/flag.map
+etc/aconfig/flag.val
+etc/aconfig/package.map
 etc/aconfig_flags.pb
 etc/aidl/le_audio/aidl_audio_set_configurations.json
 etc/aidl/le_audio/aidl_audio_set_scenarios.json
@@ -337,7 +338,6 @@ etc/init/android.hardware.boot-service.default-pixel.rc
 etc/init/android.hardware.drm-service.clearkey.rc
 etc/init/android.hardware.dumpstate-service.rc
 etc/init/android.hardware.gatekeeper-service.trusty.rc
-etc/init/android.hardware.graphics.allocator2-aidl-service.rc
 etc/init/android.hardware.health-service.zumapro.rc
 etc/init/android.hardware.power-service.pixel-libperfmgr.rc
 etc/init/android.hardware.power.stats-service.pixel.rc
@@ -363,7 +363,6 @@ etc/init/hw/init.zuma.soc.rc
 etc/init/hw/init.zumapro.board.rc
 etc/init/hw/init.zumapro.soc.rc
 etc/init/hw/init.zumapro.usb.rc
-etc/init/hwc3-pixel.rc
 etc/init/init.aoc.rc
 etc/init/init.display_logbuffer.rc
 etc/init/init.fingerprint.dump.rc
@@ -379,11 +378,9 @@ etc/init/init.touch.predump.rc
 etc/init/libg3a_gabc.rc
 etc/init/libg3a_gaf.rc
 etc/init/libg3a_ghawb.rc
-etc/init/memtrack.rc
 etc/init/nfc-service-default.rc
 etc/init/pixel-mm-gki.rc
 etc/init/pixel-thermal-symlinks.rc
-etc/init/pixelstats-vendor.zumapro.rc
 etc/init/rebalance_interrupts-vendor.gs101.rc
 etc/init/vndservicemanager.rc
 etc/le_audio_codec_capabilities.xml
@@ -422,6 +419,7 @@ etc/passwd
 etc/permissions/android.hardware.audio.low_latency.xml
 etc/permissions/android.hardware.audio.pro.xml
 etc/permissions/android.hardware.bluetooth.prebuilt.xml
+etc/permissions/android.hardware.bluetooth_le.channel_sounding.xml
 etc/permissions/android.hardware.bluetooth_le.prebuilt.xml
 etc/permissions/android.hardware.camera.concurrent.xml
 etc/permissions/android.hardware.camera.flash-autofocus.xml
@@ -430,7 +428,7 @@ etc/permissions/android.hardware.camera.full.xml
 etc/permissions/android.hardware.camera.raw.xml
 etc/permissions/android.hardware.context_hub.xml
 etc/permissions/android.hardware.device_unique_attestation.xml
-etc/permissions/android.hardware.hardware_keystore_V3.xml
+etc/permissions/android.hardware.hardware_keystore.xml
 etc/permissions/android.hardware.keystore.app_attest_key.xml
 etc/permissions/android.hardware.nfc.ese.xml
 etc/permissions/android.hardware.nfc.hce.xml
@@ -492,6 +490,7 @@ etc/selinux/vendor_property_contexts
 etc/selinux/vendor_seapp_contexts
 etc/selinux/vendor_sepolicy.cil
 etc/selinux/vendor_service_contexts
+etc/selinux/vendor_tee_service_contexts
 etc/selinux/vndservice_contexts
 etc/spatializer/base
 etc/spatializer/mode_2_ch
@@ -504,6 +503,7 @@ etc/telephony/sats2.dat
 etc/thermal_info_config.json
 etc/thermal_info_config_backup.json
 etc/thermal_info_config_charge.json
+etc/thermal_info_config_lpm.json
 etc/ueventd.rc
 etc/uwb/calibration-CE.conf
 etc/uwb/calibration-FCC.conf
@@ -533,13 +533,7 @@ etc/vintf/manifest/android.hardware.wifi-service.xml
 etc/vintf/manifest/android.hardware.wifi.hostapd.xml
 etc/vintf/manifest/android.hardware.wifi.supplicant.xml
 etc/vintf/manifest/health-storage-default.xml
-etc/vintf/manifest/hwc3-default.xml
-etc/vintf/manifest/manifest.xml
-etc/vintf/manifest/manifest_gralloc_aidl2.xml
-etc/vintf/manifest/memtrack.xml
 etc/vintf/manifest/nfc-service-default.xml
-etc/vintf/manifest/pixel-display-default.xml
-etc/vintf/manifest/pixel-display-secondary.xml
 etc/vt_estimation_model.tflite
 etc/vt_speaker_estimation_model.tflite
 etc/waves_config.ini
@@ -632,7 +626,6 @@ lib/modules/sts4x_ambient_i2c.ko
 lib/modules/syna_touch.ko
 lib/modules/vh_preemptirq_long.ko
 lib/modules/wlan_ptracker.ko
-lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/android.frameworks.stats-V1-ndk.so
 lib64/android.frameworks.stats-V2-ndk.so
 lib64/android.hardware.audio.common-V4-ndk.so
@@ -646,31 +639,10 @@ lib64/android.hardware.drm-V1-ndk.so
 lib64/android.hardware.drm.common-V1-ndk.so
 lib64/android.hardware.dumpstate-V1-ndk.so
 lib64/android.hardware.gatekeeper-V1-ndk.so
-lib64/android.hardware.graphics.allocator-V2-ndk.so
-lib64/android.hardware.graphics.allocator@2.0.so
-lib64/android.hardware.graphics.allocator@3.0.so
-lib64/android.hardware.graphics.allocator@4.0.so
-lib64/android.hardware.graphics.common-V6-ndk.so
-lib64/android.hardware.graphics.common@1.0.so
-lib64/android.hardware.graphics.common@1.1.so
-lib64/android.hardware.graphics.common@1.2.so
-lib64/android.hardware.graphics.composer3-V4-ndk.so
-lib64/android.hardware.graphics.composer@2.1-resources.so
-lib64/android.hardware.graphics.composer@2.1.so
-lib64/android.hardware.graphics.composer@2.2-resources.so
-lib64/android.hardware.graphics.composer@2.2.so
-lib64/android.hardware.graphics.composer@2.3.so
-lib64/android.hardware.graphics.composer@2.4.so
-lib64/android.hardware.graphics.mapper@2.0.so
-lib64/android.hardware.graphics.mapper@2.1.so
-lib64/android.hardware.graphics.mapper@3.0.so
-lib64/android.hardware.graphics.mapper@4.0.so
 lib64/android.hardware.health-V4-ndk.so
 lib64/android.hardware.health.storage-V1-ndk.so
-lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.nfc-V1-ndk.so
 lib64/android.hardware.power-V1-ndk.so
-lib64/android.hardware.power-V2-ndk.so
 lib64/android.hardware.power-V6-ndk.so
 lib64/android.hardware.power.stats-V2-ndk.so
 lib64/android.hardware.power.stats-impl.gs-common.so
@@ -704,21 +676,15 @@ lib64/android.media.audio.common.types-V4-ndk.so
 lib64/android.media.audio.eraser.types-V1-ndk.so
 lib64/android.system.keystore2-V1-ndk.so
 lib64/android.system.suspend-V1-ndk.so
-lib64/arm.graphics-V1-ndk.so
-lib64/com.google.hardware.pixel.display-V13-ndk.so
-lib64/hw/android.hardware.graphics.allocator-aidl-impl.so
 lib64/hw/android.hidl.memory@1.0-impl.so
 lib64/hw/audio.primary.default.so
 lib64/hw/gralloc.default.so
 lib64/hw/local_time.default.so
-lib64/hw/mapper.pixel.so
 lib64/hw/power.default.so
 lib64/hw/vibrator.default.so
-lib64/libExynosHWCService.so
 lib64/libOpenCL.so
 lib64/libaconfig_storage_read_api_cc.so
-lib64/libacryl.so
-lib64/libacryl_hdr_plugin.so
+lib64/libaho_corasick.dylib.so
 lib64/libandroid_log_sys.dylib.so
 lib64/libandroid_logger.dylib.so
 lib64/libaudio_aidl_conversion_common_ndk.so
@@ -733,54 +699,45 @@ lib64/libcrypto.so
 lib64/libcutils.so
 lib64/libdisppower-pixel.so
 lib64/libdmabufheap.so
-lib64/libdrm.so
-lib64/libdrmresource.so
 lib64/libdump.so
 lib64/libdumpstateutil.so
 lib64/libeffects.so
 lib64/libeffectsconfig.so
-lib64/libenv_logger.dylib.so
-lib64/libexynosdisplay.so
+lib64/libenv_filter.dylib.so
 lib64/libfmq.so
 lib64/libgatekeeper.so
-lib64/libgralloctypes.so
 lib64/libhardware.so
 lib64/libhardware_legacy.so
 lib64/libhidlbase.so
-lib64/libhwjpeg.so
-lib64/libion_google.so
 lib64/libjsoncpp.so
 lib64/libkeystore-engine-wifi-hidl.so
 lib64/liblibloading.dylib.so
 lib64/liblog_rust.dylib.so
 lib64/libmedia_helper.so
-lib64/libmemtrack-pixel.so
+lib64/libmemchr.dylib.so
 lib64/libnl.so
 lib64/libonce_cell.dylib.so
 lib64/libperfmgr.so
 lib64/libpixelatoms_defs.so
 lib64/libpixelhealth.so
-lib64/libpixelstats.so
 lib64/libpng.so
 lib64/libpower.so
 lib64/libprocessgroup.so
 lib64/libprotobuf-cpp-full-21.12.so
 lib64/libprotobuf-cpp-lite-21.12.so
 lib64/libreference-ril.so
+lib64/libregex.dylib.so
+lib64/libregex_syntax.dylib.so
 lib64/libril.so
 lib64/librilutils.so
-lib64/libsensorndkbridge.so
-lib64/libspeechenhancer.so
 lib64/libspeexresampler.so
 lib64/libssl.so
 lib64/libstagefright_foundation.so
 lib64/libstd.dylib.so
 lib64/libtinyxml2.so
 lib64/libtrusty.so
-lib64/libui.so
 lib64/libusbhost.so
 lib64/libutils.so
-lib64/libvendorgraphicbuffer.so
 lib64/libvibratorutils.so
 lib64/libwifi-hal.so
 lib64/libwifi-system-iface.so
@@ -864,6 +821,8 @@ overlay/TeleService__comet_beta__auto_generated_rro_vendor.apk
 overlay/Traceur__comet_beta__auto_generated_rro_vendor.apk
 overlay/framework-res__comet_beta__auto_generated_rro_vendor.apk

+overlay/UwbOverlayCT3/UwbOverlayCT3Gsi.apk
+
 # Symlinks
 lib/modules

@@ -933,15 +892,12 @@ lib64/libavservices_minijail.so
 lib64/libcap.so
 lib64/libcodec2.so
 lib64/libcodec2_aidl.so
+lib64/libcodec2_aidl_noisurface.so
 lib64/libcodec2_hal_common.so
 lib64/libcodec2_hidl@1.0.so
-lib64/libcodec2_hidl@1.1.so
-lib64/libcodec2_hidl@1.2.so
 lib64/libcodec2_hidl_plugin.so
 lib64/libcodec2_soft_common.so
 lib64/libcodec2_vndk.so
-lib64/libexynosutils.so
-lib64/libexynosv4l2.so
 lib64/libmedia_ecoservice.so
 lib64/libmedia_omx.so
 lib64/libminijail.so
@@ -949,7 +905,6 @@ lib64/libsfplugin_ccodec_utils.so
 lib64/libstagefright_aidl_bufferpool2.so
 lib64/libstagefright_bufferpool@2.0.1.so
 lib64/libstagefright_bufferqueue_helper.so
-lib64/libstagefright_omx.so
 lib64/libstagefright_omx_utils.so
 lib64/libstagefright_xmlparser.so

@@ -961,15 +916,21 @@ lib64/chremetrics-cpp.so

 # Experiments
 bin/pixel-experiments-recovery.sh
-etc/init/pixel-apf-experiment.rc
 etc/init/pixel-experiments-recovery.rc
-etc/init/pixel-kswapd-experiment.rc

 # Fingerprint
 etc/permissions/android.hardware.fingerprint.xml

 # GPS
 etc/permissions/android.hardware.location.gps.prebuilt.xml
+lib64/android.hardware.gnss-V3-ndk.so
+lib64/android.hardware.gnss.measurement_corrections@1.0.so
+lib64/android.hardware.gnss.measurement_corrections@1.1.so
+lib64/android.hardware.gnss.visibility_control@1.0.so
+lib64/android.hardware.gnss@1.0.so
+lib64/android.hardware.gnss@1.1.so
+lib64/android.hardware.gnss@2.0.so
+lib64/android.hardware.gnss@2.1.so
 lib64/libcurl.so
 lib64/liblzma.so
 lib64/libunwindstack.so
@@ -978,22 +939,15 @@ lib64/libunwindstack.so
 lib64/libhidltransport.so
 lib64/libhwbinder.so

-# Identity credential
-lib64/libpuresoftkeymasterdevice.so
-lib64/libsoft_attestation_cert.so
-
 # Json
 lib64/libjson.so

 # Nos
 lib64/android.hardware.security.keymint-V3-ndk.so
-lib64/lib_android_keymaster_keymint_utils.so
 lib64/libcppbor.so
 lib64/libcppcose_rkp.so
 lib64/libkeymaster_messages.so
 lib64/libkeymaster_portable.so
-lib64/libkeymint.so
-lib64/libkeymint_support.so
 lib64/libkeymint_support_V3.so
 lib64/libnos.so
 lib64/libnos_client_citadel.so
@@ -1015,39 +969,53 @@ lib64/modem_clock_manager.so
 lib64/modem_clock_manager_impl.so

 # Sensors
+lib64/android.frameworks.sensorservice-V1-ndk.so
 lib64/hw/sensors.dynamic_sensor_hal.so
 lib64/libhidparser.so
+lib64/libsensorndkbridge.so

 # Trusty
 lib64/android.trusty.stats.nw.setter-cpp.so
 lib64/libbinder_trusty.so
-lib64/libtrusty_metrics.so

 # Misc interfaces
 lib64/android.frameworks.stats-V1-cpp.so
 lib64/android.hardware.authsecret-V1-ndk.so
 lib64/android.hardware.biometrics.common-V3-ndk.so
 lib64/android.hardware.biometrics.fingerprint-V3-ndk.so
-lib64/android.hardware.gnss-V3-ndk.so
-lib64/android.hardware.gnss.measurement_corrections@1.0.so
-lib64/android.hardware.gnss.measurement_corrections@1.1.so
-lib64/android.hardware.gnss.visibility_control@1.0.so
-lib64/android.hardware.gnss@1.0.so
-lib64/android.hardware.gnss@1.1.so
-lib64/android.hardware.gnss@2.0.so
-lib64/android.hardware.gnss@2.1.so
+lib64/android.hardware.graphics.allocator-V2-ndk.so
+lib64/android.hardware.graphics.allocator@2.0.so
+lib64/android.hardware.graphics.allocator@3.0.so
+lib64/android.hardware.graphics.allocator@4.0.so
 lib64/android.hardware.graphics.bufferqueue@1.0.so
 lib64/android.hardware.graphics.bufferqueue@2.0.so
+lib64/android.hardware.graphics.common-V6-ndk.so
+lib64/android.hardware.graphics.common@1.0.so
+lib64/android.hardware.graphics.common@1.1.so
+lib64/android.hardware.graphics.common@1.2.so
+lib64/android.hardware.graphics.composer3-V4-ndk.so
+lib64/android.hardware.graphics.composer@2.1-resources.so
+lib64/android.hardware.graphics.composer@2.1.so
+lib64/android.hardware.graphics.composer@2.2-resources.so
+lib64/android.hardware.graphics.composer@2.2.so
+lib64/android.hardware.graphics.composer@2.3.so
+lib64/android.hardware.graphics.composer@2.4.so
+lib64/android.hardware.graphics.mapper@2.0.so
+lib64/android.hardware.graphics.mapper@2.1.so
+lib64/android.hardware.graphics.mapper@3.0.so
+lib64/android.hardware.graphics.mapper@4.0.so
 lib64/android.hardware.health-V1-ndk.so
 lib64/android.hardware.input.common-V1-ndk.so
 lib64/android.hardware.input.processor-V1-ndk.so
 lib64/android.hardware.keymaster-V4-ndk.so
+lib64/android.hardware.memtrack-V1-ndk.so
 lib64/android.hardware.neuralnetworks-V4-ndk.so
 lib64/android.hardware.neuralnetworks@1.0.so
 lib64/android.hardware.neuralnetworks@1.1.so
 lib64/android.hardware.neuralnetworks@1.2.so
 lib64/android.hardware.neuralnetworks@1.3.so
 lib64/android.hardware.oemlock-V1-ndk.so
+lib64/android.hardware.power-V2-ndk.so
 lib64/android.hardware.radio-V2-ndk.so
 lib64/android.hardware.radio.config-V2-ndk.so
 lib64/android.hardware.radio.config@1.0.so
@@ -1075,12 +1043,16 @@ lib64/android.hardware.weaver-V2-ndk.so
 lib64/android.hidl.token@1.0-utils.so
 lib64/android.hidl.token@1.0.so
 lib64/com.google.hardware.pixel.display-V9-ndk.so
+lib64/com.google.hardware.pixel.display-V15-ndk.so
 lib64/hardware.google.ril_ext-V1-ndk.so

 # Misc
 bin/dump/dump_gsc.sh
+lib64/libdrm.so
 lib64/libevent.so
+lib64/libgralloctypes.so
 lib64/libion.so
+lib64/libui.so

 # Odex
 framework/oat/arm64/com.google.android.camera.experimental2024.odex
@@ -1088,5 +1060,10 @@ framework/oat/arm64/com.google.android.camera.experimental2024.vdex

 # Completely skip files that are not required

+# Flood control
+bin/flood.control.hal
+etc/init/init.flood.control.rc
+etc/vintf/manifest/flood_control.xml
+
 # Google
 etc/default-permissions/default-permissions_talkback.xml
--- a/comet_generic.mk
+++ b/comet_generic.mk
@@ -1,20 +0,0 @@
-#
-# Copyright 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.
-# 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/comet/device-comet.mk)
-
-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p24_common
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -101,6 +101,7 @@ on post-fs-data
    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable

 # Permissions for hwcomposer
+on fs
    chown system system /sys/class/backlight/panel1-backlight/als_table
    chown system system /sys/class/backlight/panel1-backlight/brightness
    chown system system /sys/class/backlight/panel1-backlight/dimming_on
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -32,47 +32,24 @@ else
 TARGET_LINUX_KERNEL_VERSION ?= 6.1
 endif

-ifdef RELEASE_KERNEL_COMET_DIR
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_COMET_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_COMET_DIR)/kernel-headers
-else
-TARGET_KERNEL_DIR ?= device/google/comet-kernels/6.1/24D1
-TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernels/6.1/24D1/kernel-headers
-endif
+TARGET_KERNEL_DIR := device/google/comet-kernels/evolution
+TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers

 TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT

 LOCAL_PATH := device/google/comet

-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-    USE_UWBFIELDTESTQM := true
-endif
-ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),)
-    include device/google/comet/uwb/uwb_calibration.mk
-endif
-
-$(call inherit-product-if-exists, vendor/google_devices/comet/prebuilts/device-vendor-comet.mk)
-$(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/zumapro/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/comet/device-vendor-comet.mk)
-$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
-
-ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),)
-    $(call inherit-product-if-exists, vendor/google_devices/comet/proprietary/WallpapersComet.mk)
-endif
+include device/google/comet/uwb/uwb_calibration.mk

 DEVICE_PACKAGE_OVERLAYS += device/google/comet/comet/overlay

-ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true)
 USE_AUDIO_HAL_AIDL := true
-endif

 include device/google/comet/audio/comet/audio-tables.mk
 include device/google/zumapro/device-shipping-common.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/touch/gti/predump_gti_dual.mk
-include device/google/gs-common/display/dump_second_display.mk
+include device/google/gs-common/display/dump_exynos_second_display.mk
 include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk

 # Increment the SVN for any official public releases
@@ -128,12 +105,10 @@ PRODUCT_COPY_FILES += \
 	device/google/comet/comet/panel_config_google-ct3d_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-ct3d_cal1.pb \
        device/google/comet/comet/panel_config_google-ct3e_cal1.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-ct3e_cal1.pb

-ifeq ($(filter factory_comet, $(TARGET_PRODUCT)),)
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.xrr.version=2.1
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=20:120,30:60,:1
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.headsup_ns=30000000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.vrr.expected_present.timeout_ns=500000000
-endif

 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.vendor.primarydisplay.powerstats.entity_name=Inner-Display

@@ -197,11 +172,7 @@ PRODUCT_COPY_FILES += \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_backup_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_backup.json \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
 	$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_speaker_estimation_model_comet.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_speaker_estimation_model.tflite \
-
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-	PRODUCT_COPY_FILES += \
-		$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_comet_wingboard.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_wingboard.json
-endif
+        $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_lpm_comet.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_lpm.json \

 PRODUCT_PACKAGES += \
 	init_thermal_config
@@ -231,18 +202,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
    ro.gms.dck.eligible_wcc=3 \
    ro.gms.dck.se_capability=1

-# Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_ENG += \
-    hci_inject
-
-# Bluetooth SAR test tool
-PRODUCT_PACKAGES_ENG += \
-    sar_test
-
-# Bluetooth EWP test tool
-PRODUCT_PACKAGES_ENG += \
-    ewp_tool
-
 # Bluetotoh Auto On feature
 PRODUCT_PRODUCT_PROPERTIES +=\
    bluetooth.server.automatic_turn_on=true
@@ -256,19 +215,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
    bluetooth.hfp.swb.supported=true

 # Override BQR mask to enable LE Audio Choppy report, remove BTRT logging
-ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_PRODUCT_PROPERTIES += \
-    persist.bluetooth.bqr.event_mask=295006 \
-    persist.bluetooth.bqr.vnd_quality_mask=29 \
-    persist.bluetooth.bqr.vnd_trace_mask=0 \
-    persist.bluetooth.vendor.btsnoop=true
-else
 PRODUCT_PRODUCT_PROPERTIES += \
    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
-endif

 # Support LE & Classic concurrent encryption (b/330704060)
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -289,23 +240,13 @@ PRODUCT_PROPERTY_OVERRIDES += \
       ro.audio.spatializer_transaural_enabled_default=false \
       persist.vendor.audio.spatializer.speaker_enabled=true

-ifneq ($(USE_AUDIO_HAL_AIDL),true)
-# HIDL Sound Dose
-PRODUCT_PACKAGES += \
-	android.hardware.audio.sounddose-vendor-impl \
-	audio_sounddose_aoc
-endif
-
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false

 # HdMic Audio
-PRODUCT_SOONG_NAMESPACES += device/google/comet/audio/comet/prebuilt/libspeechenhancer
 PRODUCT_PROPERTY_OVERRIDES += \
    persist.vendor.app.audio.gsenet.version=1
-PRODUCT_PACKAGES += \
-    libspeechenhancer

 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
@@ -343,7 +284,8 @@ PRODUCT_SOONG_NAMESPACES += \

 # UWB Overlay
 PRODUCT_PACKAGES += \
-	UwbOverlayCT3
+	UwbOverlayCT3 \
+	UwbOverlayCT3Gsi

 # WiFi Overlay
 PRODUCT_PACKAGES += \
@@ -364,9 +306,6 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.support_kernel_idle_timer_4619827
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.set_idle_timer_ms_4619827677550801153=1000
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += debug.sf.support_kernel_idle_timer_4619827677550801153=false

-# Trusty liboemcrypto.so
-PRODUCT_SOONG_NAMESPACES += vendor/google_devices/comet/prebuilts
-
 # UWB
 PRODUCT_SOONG_NAMESPACES += \
    device/google/comet/uwb
@@ -415,8 +354,6 @@ PRODUCT_VENDOR_PROPERTIES += \

 # Haptics
 # Placeholders for updates later, need to update:
-# remove ro.vendor.vibrator.hal.dbc.enable (needed for setting pm.activetimeout)
-# remove pm.activetimeout
 # ro.vendor.vibrator.hal.loc.coeff.folded currently unused
 $(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
@@ -426,8 +363,6 @@ PRODUCT_VENDOR_PROPERTIES += \
    ro.vendor.vibrator.hal.device.mass=0.2605 \
    ro.vendor.vibrator.hal.loc.coeff.folded=3.15 \
    ro.vendor.vibrator.hal.loc.coeff=2.58 \
-    ro.vendor.vibrator.hal.dbc.enable=1 \
-    ro.vendor.vibrator.hal.pm.activetimeout=5 \
    persist.vendor.vibrator.hal.context.enable=false \
    persist.vendor.vibrator.hal.context.scale=60 \
    persist.vendor.vibrator.hal.context.fade=true \
@@ -514,11 +449,6 @@ PRODUCT_COPY_FILES += \
 # Support RIL Domain-selection
 SUPPORT_RIL_DOMAIN_SELECTION := true

-# ETM
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
-endif
-
 # Connectivity Resources Overlay for Thread host settings
 PRODUCT_PACKAGES += \
    ConnectivityResourcesOverlayCometOverride
--- a/device-evolution.mk
+++ b/device-evolution.mk
@@ -0,0 +1,6 @@
+#
+# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -35,9 +35,9 @@ include device/google/gs-common/wireless_charger/wireless_charger.mk

 # Build necessary packages for vendor

-# Codec2
+# Dumpstate
 PRODUCT_PACKAGES += \
-    libexynosv4l2
+    dump_gsc.sh

 # Fingerprint
 PRODUCT_COPY_FILES += \
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -1,7 +1,7 @@
 <compatibility-matrix version="1.0" type="framework">
    <hal format="aidl" optional="true">
      <name>com.google.hardware.pixel.display</name>
-        <version>13</version>
+        <version>13-15</version>
        <interface>
            <name>IDisplay</name>
            <instance>secondary</instance>
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -0,0 +1,16 @@
+[
+  {
+    "repository": "device_google_zumapro",
+    "target_path": "device/google/zumapro"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "device_google_comet-kernels_evolution",
+    "target_path": "device/google/comet-kernels/evolution"
+  },
+  {
+    "remote": "evo-tensor",
+    "repository": "vendor_google_comet",
+    "target_path": "vendor/google/comet"
+  }
+]
--- a/factory-images/generate-factory-images-package.sh
+++ b/factory-images/generate-factory-images-package.sh
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-# Copyright 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.
-# 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=11395222
-DEVICE=comet
-PRODUCT=comet
-VERSION=ad1a.240202.002
-SRCPREFIX=signed-
-BOOTLOADER=ripcurrentpro-14.6-11387780
-RADIO=g5400c-240123-240201-b-11389921
-source ../../../common/generate-factory-images-common.sh
--- a/factory_comet.mk
+++ b/factory_comet.mk
@@ -1,53 +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 := 6.1
-
-$(call inherit-product, device/google/zumapro/factory_common.mk)
-$(call inherit-product, device/google/comet/device-comet.mk)
-include device/google/comet/audio/comet/factory-audio-tables.mk
-
-PRODUCT_NAME := factory_comet
-PRODUCT_DEVICE := comet
-PRODUCT_MODEL := Factory build on Comet
-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"
-
-# Location
-PRODUCT_PACKAGES += \
-	sctd \
-	spad \
-	swcnd \
-	libmptool_json \
-	libmptool_log \
-	libmptool_utils \
-	sctd.json \
-	spad.json \
-	swcnd.json \
-	android.hardware.gnss@2.1-impl
-
-# Factory binary of camera
-PRODUCT_PACKAGES += fatp_ct3_wide_hat_tool fatp_ct3_tele_hat_tool fatp_ct3_ultrawide_hat_tool
-PRODUCT_PACKAGES += fatp_camera_eeprom_inspector
-
-PRODUCT_WITHOUT_TTS_VOICE_PACKS := true
-
-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -1,11 +0,0 @@
-[
-  {
-    "repository": "android_device_google_zumapro",
-    "target_path": "device/google/zumapro"
-  },
-  {
-    "repository": "device/google/comet-kernels/6.1",
-    "target_path": "device/google/comet-kernels/6.1",
-    "remote": "aosp-comet"
-  }
-]
--- a/lineage_comet.mk
+++ b/lineage_comet.mk
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #

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

@@ -14,7 +14,9 @@ DEVICE_PATH := device/google/comet
 VENDOR_PATH := vendor/google/comet
 $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk)
 $(call inherit-product, device/google/zumapro/lineage_common.mk)
+$(call inherit-product, device/google/zumapro/evolution_common.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
@@ -26,8 +28,8 @@ TARGET_SCREEN_HEIGHT := 2424
 TARGET_SCREEN_WIDTH := 1080

 PRODUCT_BUILD_PROP_OVERRIDES += \
-    BuildDesc="comet-user 15 BP1A.250505.005 13277524 release-keys" \
-    BuildFingerprint=google/comet/comet:15/BP1A.250505.005/13277524:user/release-keys \
+    BuildDesc="comet-user 16 BP2A.250805.005 13691446 release-keys" \
+    BuildFingerprint=google/comet/comet:16/BP2A.250805.005/13691446:user/release-keys \
    DeviceProduct=$(DEVICE_CODENAME)

 $(call inherit-product, $(VENDOR_PATH)/$(DEVICE_CODENAME)-vendor.mk)
--- a/location/Android.bp
+++ b/location/Android.bp
@@ -4,45 +4,9 @@ package {
    default_applicable_licenses: ["device_google_comet_license"],
 }

-soong_config_module_type {
-    name: "gnss_prebuilt_etc",
-    module_type: "prebuilt_etc",
-    config_namespace: "gpssdk",
-    variables: [
-        "buildtype",
-    ],
-    properties: [
-        "src",
-    ],
-}
-
-soong_config_string_variable {
-    name: "buildtype",
-    values: [
-        "user",
-        "userdebug",
-        "eng",
-    ],
-}
-
-gnss_prebuilt_etc {
+prebuilt_etc {
    name: "gps.cfg",
-    soong_config_variables: {
-        buildtype: {
-            user: {
-                src: "user/gps.cfg",
-            },
-            userdebug: {
-                src: "user/gps.cfg",
-            },
-            eng: {
-                src: "userdebug/gps.cfg",
-            },
-            conditions_default: {
-                src: "user/gps.cfg",
-            },
-        },
-    },
+    src: "user/gps.cfg",
    relative_install_path: "gnss",
    vendor: true,
 }
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -25,15 +25,15 @@ ChipCfg_VDR_high_end_Time = 20
 ChipCfg_VDR_low_end_Time = 20
 Chip_Configuration_AidingConfiguration=0x00020046
 Chip_Configuration_RefClkControl=0x24
-Chip_Configuration_DCXO_CrystalType=0x11
+Chip_Configuration_DCXO_CrystalType=0x01
 Chip_Configuration_GNSSConstConstraintDef = 0x60FF
 LocTech_Constraints = 0x60FF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 Chip_Configuration_ntn_option=2
-bdsUsedInUSPolicy=2
-sbasUsedInUSPolicy=2
-qzssUsedInUSPolicy=2
-navicUsedInUSPolicy=2
+bdsUsedPolicy=2
+sbasUsedPolicy=2
+qzssUsedPolicy=2
+navicUsedPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
 Chip_Configuration_FeatureCfg_MTPL = 1
@@ -42,8 +42,12 @@ mailboxDisabled=0x0
 gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
+lal_metrics_interval_ms=0
 Sif_UseFwXtraInterface=1
 Agnss_IsGloAidingEnable=0
+Agnss_IsGalAidingEnable=0
+Agnss_IsBdsAidingEnable=0
+Agnss_SuplAidIntvlCrossSess=1
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
 SETCaps_SuplUT1=20
@@ -70,16 +74,20 @@ UP_LocTech_PrimaryConst=0
 UP_LocTech_Constraints=1
 UP_LocTech_Requirements=0
 SpotLogger_Allowed=0
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
+SingleBandAcq=474
+MultiBandAcq=586
+SingleBandFullTrkNm=432
+SingleBandFullTrkUd=390
+MultiBandFullTrkNm=572
+MultiBandFullTrkUd=509
+SingleBandDutyCycleTrkNm=390
+SingleBandDutyCycleTrkUd=355
+MultiBandDutyCycleTrkNm=509
+MultiBandDutyCycleTrkUd=453
+SingleBandVddGnssNmTrk=145
+MultiBandVddGnssNmTrk=187
+SingleBandVddGnssUdTrk=103
+MultiBandVddGnssUdTrk=131
 path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
 path_delay_gps_2fx_cm = 12342
 path_delay_bds_4fx_cm = 123
@@ -88,6 +96,7 @@ RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
 RfPathLossDb_L5_Cp=4300
+NmeaBitmask=0x010003fff
 IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 cp_partial_reset_disable=1
@@ -114,7 +123,7 @@ ENABLE_4G_UP_CAPS_MSA=1
 ENABLE_4G_UP_CAPS_MSB=1
 ENABLE_5G_UP_CAPS_MSA=0
 ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=TLSv1_1
+SUPL_SSL_METHOD=TLS_AUTO
 SUPL_HMAC_HASH=SHA256
 SUPL_UT2_SEC=20
 SUPL_UT3_SEC=20
@@ -155,10 +164,14 @@ ENABLE_LPP_UP=1
 ENABLE_LPPE_UP=3

 GNSS_CARRIER_ID=6
+ENABLE_CAPS_OTDOA=0
 ENABLE_LPP_CP=0
 ENABLE_LPP_UP=1
 ENABLE_LPPE_CP=0
 ENABLE_LPPE_UP=3
+ENABLE_2G_UP_CAPS_MSA=0
+ENABLE_3G_UP_CAPS_MSA=0
+ENABLE_4G_UP_CAPS_MSA=0

 GNSS_CARRIER_ID=7
 ENABLE_LPP_CP=0
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -1,338 +0,0 @@
-############################################
-GlueLayer_ToolConfigSelection=3
-user_ports_tcp_name=Autotest
-user_ports_tcp_port=7555
-debug_console=1
-debug_dir=/data/vendor/gps/logs
-############################################
-GlueLayer_IsGedKeyExist=1
-GlueLayer_EnableGnssCfgInterface=1
-
-uni_log_max_file_count=5
-uni_log_max_size_mb=20
-uni_log_total_max_size_mb=100
-
-debug_enable=4
-mem_dump_to_node=1
-
-gnss_device_type=K042
-
-gnss_device_patch_address=0
-gnss_device_patch_file=/vendor/firmware/kepler.bin
-
-allow_logging_if_disconnected=0
-
-# enable ism stream for GAAM
-ism_stream_enable=1
-caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK
-
-# Enable/Disable 1PPS Time Sync policy
-Is1PPSTimeSyncEnable=1
-
-MaxNtnRefLocAgeSecs=600
-# CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK
-#Chip_Configuration_Io_Options=0x9
-# enable DEBUG sync msg
-#Chip_Configuration_Io_Options=0xD
-
-# force CP crash on GAL bad ISM (1 is first instance, 2 is when we assert)
-#Chip_Configuration_cpdbgsync=1
-
-# Chip_Configuration_TrackerDebugMode = 0x10
-GlueLayer_IsPlatformRefTimeEnable=1
-
-# enables CHPP for SPI port
-# uncomment the *chpp* lines below (and comment gnss_device-data_port_kepslim_present above) to use SPI+CHPP
-# when using CHPP, make sure to enable the CHPP defines in build_settings.mak
-chpp_betp_client=1
-chpp_log_level=2
-gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc
-gnss_device_data_port_chpp_present=1
-
-### Update for VTS ###
-GlueLayer_YearOfHW=2023
-scheduling_enabled=1
-
-# 1pps timemark output: 0: disable 1: enable
-ChipCfg_Timemark_Option=1
-
-# VDR End condition (meter, meter, sec, sec)
-ChipCfg_VDR_high_end_Distance = 200
-ChipCfg_VDR_low_end_Distance = 200
-ChipCfg_VDR_high_end_Time = 20
-ChipCfg_VDR_low_end_Time = 20
-
-### temporarily disable precise time aiding ###
-Chip_Configuration_AidingConfiguration=0x00020046
-
-# set shared reference clock for freq aiding (0x20)
-# enable dcxo (0x04)
-Chip_Configuration_RefClkControl=0x24
-#Chip_Configuration_RefClkControl=0x20
-#Chip_Configuration_RefClkUncertainty=20000
-
-### Override for DCXO Cnom/TuneValue
-#Chip_Configuration_DCXOtuneValue=5143
-
-### DCXO Optional Parameters. #####
-#   Can specify Crystal type, and/or over-ride T0-inflection point ####
-#
-# Optionally specify DXCO Crystal type, and operation mode
-# 8 bits.  Lower 4 bits Crystal ID# (0-15)
-#          Upper 4 bits Poly Configuration: (0/1)
-# Poly Configuration: 0: Use CP's poly, 1: Force use of default manufactures polynomial
-### Crystal Types:
-## 0 - Unknown/Default
-## 1 - Kyocera CT1612RB
-## 2 - NDK NX1612SD CS12311
-## 3 - NDK NX1612SD CS13950
-## 4 - NDK NX1612SD CS15298
-## 5 - KDS 7CG07680A10
-## 6-  TXC 0W76870003
-## E.g. Use Kyocera, and ignore CP's polynomial: DCXO_CrystalType=0x11
-## E.g. Use KDS, and Use CP's polynomial: DCXO_CrystalType=0x05
-## LOOK! S5400 ERD's uses NDK(2), Phones use Kyocera(1). Default set to phone (1)
-Chip_Configuration_DCXO_CrystalType=0x11
-
-## Optionally specify DXCO Inflection point temperature,        ####
-#    This will override any default value or value in Crystal type ####
-#    Value is degrees C x 100 E.g. 2855 = 28.55 deg C
-#    Range should be 2000 to 3100
-#Chip_Configuration_DCXO_InflectionPoint=2855
-
-# L1 + L5 MCW
-Chip_Configuration_GNSSConstConstraintDef = 0x60FF
-LocTech_Constraints = 0x60FF
-Chip_Configuration_RfMiscCtrl = 0x80008001
-
-### 2C48 L1 only MCW ###
-#Chip_Configuration_GNSSConstConstraintDef=0x602F
-#Chip_Configuration_RfMiscCtrl=0x80008001
-
-# L1 HYSPDY - CP
-#Chip_Configuration_GNSSConstConstraintDef=0x602F
-#LocTech_Constraints = 0x602F
-#Chip_Configuration_RfMiscCtrl=0x8001
-#Chip_Configuration_IspTestConfig=0x22242822
-
-#Chip_Configuration_ntn_option=0 means no NTN blackout IPC handling
-#Chip_Configuration_ntn_option=1 means L1 blanking during NTN blackout period.
-#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period.
-Chip_Configuration_ntn_option=2
-
-# Disable BDS in the U.S.
-# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
-#gloUsedInUSPolicy=2
-bdsUsedInUSPolicy=2
-sbasUsedInUSPolicy=2
-qzssUsedInUSPolicy=2
-navicUsedInUSPolicy=2
-
-# DVS: 0 = Disabled, 1 = Enabled (default)
-# DFS: 0 = Disabled, 1 = Enabled (default)
-Chip_Configuration_FeatureCfg_DVS = 1
-Chip_Configuration_FeatureCfg_DFS = 1
-# MTPL: 0 = Disabled, 1 = Enabled
-Chip_Configuration_FeatureCfg_MTPL = 1
-# MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start)
-Chip_Configuration_FeatureCfg_SDL_BYASS = 1
-
-# This is a bitfield that will disable incoming interrupts for mailboxes
-# AP   = 0x1
-# APM  = 0x2
-# CP   = 0x4
-# CHUB = 0x8
-mailboxDisabled=0x0
-
-### Specify RFIC ID for K42 ###
-# 55400000 = S5540 EVT0
-gnss_rfic_chip_id=55400000
-
-# Uncomment to Disable SUPL
-#Aiding_AidingType=0
-# Uncomment to Disable SUPL (Ignore Android Framework Requests to Enable SUPL)
-#GlueLayer_EnableFwConfiguration=0
-
-#Uncomment to disable SGEE
-#Sif_OperationMode=0
-
-# Enables RTC time aiding from Host
-# 1 - enable, 0 - disable (default)
-UseRtcForAiding=1
-
-# increase rtc uncertainty from Host to hedge against bad fixes
-additional_rtc_uncertainty_ms=10
-
-# set to 1 for FW SGEE download - Requires Android FW to be properly configured
-Sif_UseFwXtraInterface=1
-
-# ChipCfg_GetGpsWeekFloor variable allows testing of old GPS weeks.
-# Used here to adjust the GPS week for carrier testing.
-# Simulations in the past may be based on any week number.
-# Guidelines:
-#    If simulation week absolute week number is:
-#       1-1023:              ChipCfg_SetGpsWeekFloor=1
-#       1024-2047:           ChipCfg_SetGpsWeekFloor=1024
-#       2048-3071:           ChipCfg_SetGpsWeekFloor=2048
-# Example: ChipCfg_GetGpsWeekFloor=1024
-# The above sets the correct operation when the true week is between 1024 and 2048
-# ChipCfg_GetGpsWeekFloor=0
-
-Agnss_IsGloAidingEnable=0
-SETCaps_IsOtdoa=1
-SETCaps_IsLpp=1
-SETCaps_SuplUT1=20
-PosReq_Supl2Params_SuplNiUdpPort=7275
-GlueLayer_LPPCpBitmask=0xFF
-GlueLayer_IsCpLteNeighborCellEnable=1
-GlueLayer_isReqDBHFromFwRefLoc=1
-GlueLayer_isReqUBPFromPressureSensor=1
-GlueLayer_IsRilCIDReqEnable=0
-GlueLayer_IsMemsEnable=1
-GlueLayer_MeasCorrCap=7
-
-# 0x0001: CHIP_CONFIG_MEMS_ACCEL_AVAILABLE
-# 0x0002: CHIP_CONFIG_MEMS_MAGN_AVAILABLE
-# 0x0004: CHIP_CONFIG_MEMS_GYRO_AVAILABLE
-# 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE
-# 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE
-Chip_Configuration_mems_data_Configuration=0x25
-AccelSamplingPeriodUs=10000
-MagnSamplingPeriodUs=10000
-GyroSamplingPeriodUs=10000
-PressSamplingPeriodUs=50000
-OrientationSamplingPeriodUs=10000
-StepCounterSamplingPeriodUs=1000000
-Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1
-CP_LocTech_PrimaryConst=0
-CP_LocTech_Constraints=1
-CP_LocTech_Requirements=0
-UP_LocTech_PrimaryConst=0
-UP_LocTech_Constraints=1
-UP_LocTech_Requirements=0
-SpotLogger_Allowed=0
-
-# GNSS power values in "mW"
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
-
-path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
-path_delay_gps_2fx_cm = 12342
-path_delay_bds_4fx_cm = 123
-path_delay_l5_20fx_cm = 105916
-
-RfPathLossDb_Ap=3600
-RfPathLossDb_Cp=3600
-RfPathLossDb_L5_Ap=4300
-RfPathLossDb_L5_Cp=4300
-NmeaBitmask=0x010003fff
-
-# force engine to use entire response time for emergency session; default 0
-IsUseEntireRespTime911=1
-# force engine to engage high accuracy if entire response time used; default 0
-isForceHighAccuracyMode=1
-
-# This is to indicate if AP supports CP partial reset feature
-# default = CP partial reset feature enabled
-# 0       = CP partial reset feature enabled
-# 1       = CP partial reset feature disabled
-cp_partial_reset_disable=1
-
-# 0: Use calibrated data 1: Use uncalibrated data
-isUseUncalAccel=1
-isUseUncalMagn=0
-
-# 0x0001: Enable StaticNavMode
-# 0x0002: Enable TunnelDetection
-# 0x0040: Self-detection Algorithm works
-# 0x0400: Enable MEMS S5
-# 0x2000: Enable MEMS PGMF (Pedestrian GNSS + MEMS Fusion)
-NavOptions=0x2443
-
-GNSS_CARRIER_CONFIG_BEGIN
-# DEFAULT
-GNSS_CARRIER_ID=0
-ENABLE_CAPS_OTDOA=1
-ENABLE_2G_CP_CAPS_MSA=1
-ENABLE_2G_CP_CAPS_MSB=1
-ENABLE_3G_CP_CAPS_MSA=1
-ENABLE_3G_CP_CAPS_MSB=1
-ENABLE_4G_CP_CAPS_MSA=1
-ENABLE_4G_CP_CAPS_MSB=1
-ENABLE_5G_CP_CAPS_MSA=1
-ENABLE_5G_CP_CAPS_MSB=1
-ENABLE_2G_UP_CAPS_MSA=1
-ENABLE_2G_UP_CAPS_MSB=1
-ENABLE_3G_UP_CAPS_MSA=1
-ENABLE_3G_UP_CAPS_MSB=1
-ENABLE_4G_UP_CAPS_MSA=1
-ENABLE_4G_UP_CAPS_MSB=1
-ENABLE_5G_UP_CAPS_MSA=0
-ENABLE_5G_UP_CAPS_MSB=0
-SUPL_SSL_METHOD=TLSv1_1
-SUPL_HMAC_HASH=SHA256
-SUPL_UT2_SEC=20
-SUPL_UT3_SEC=20
-ENABLE_LPP_CP=1
-ENABLE_LPP_UP=0
-ENABLE_LPPE_CP=3
-ENABLE_LPPE_UP=0
-ENABLE_NLP_ALONG_WITH_UBP=0
-ENABLE_NLP_IN_LPPE=1
-ENABLE_NLP_IN_AGNSS=0
-ENABLE_LPP_HA_GAD_SHAPE=0
-USE_EMER_PDN_FOR_EMER_SUPL=1
-CP_LOCTECH_CONSTRAINTS=1
-UP_LOCTECH_CONSTRAINTS=1
-# ATT
-GNSS_CARRIER_ID=1
-CP_LOCTECH_CONSTRAINTS=5
-# TMO
-GNSS_CARRIER_ID=2
-ENABLE_3G_CP_CAPS_MSA=0
-ENABLE_4G_CP_CAPS_MSA=0
-ENABLE_NLP_IN_LPPE=0
-ENABLE_NLP_IN_AGNSS=1
-ENABLE_LPP_HA_GAD_SHAPE=1
-CP_LOCTECH_CONSTRAINTS=5
-# VZW
-GNSS_CARRIER_ID=3
-ENABLE_LPP_UP=1
-ENABLE_LPPE_UP=3
-SUPL_SSL_METHOD=TLSv1_2
-SUPL_UT2_SEC=10
-SUPL_UT3_SEC=30
-# AIRTEL
-GNSS_CARRIER_ID=4
-# RAKUTEN
-GNSS_CARRIER_ID=5
-ENABLE_LPP_UP=1
-ENABLE_LPPE_UP=3
-# KDDI
-GNSS_CARRIER_ID=6
-ENABLE_LPP_CP=0
-ENABLE_LPP_UP=1
-ENABLE_LPPE_CP=0
-ENABLE_LPPE_UP=3
-# SBM
-GNSS_CARRIER_ID=7
-ENABLE_LPP_CP=0
-ENABLE_LPPE_CP=0
-ENABLE_5G_CP_CAPS_MSA=0
-ENABLE_5G_CP_CAPS_MSB=0
-USE_EMER_PDN_FOR_EMER_SUPL=0
-# DOCOMO
-GNSS_CARRIER_ID=8
-# LAB
-GNSS_CARRIER_ID=9
-ENABLE_LPP_UP=1
-ENABLE_LPPE_UP=3
-GNSS_CARRIER_CONFIG_END
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,116 +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.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="hidl">
-       <name>vendor.google.whitechapel.audio.audioext</name>
-       <transport>hwbinder</transport>
-       <version>3.0</version>
-       <interface>
-           <name>IAudioExt</name>
-           <instance>default</instance>
-       </interface>
-    </hal>
-    <kernel target-level="6"/>
-</manifest>
--- a/overlay-lineage/frameworks/base/core/res/res/values-sw820dp-notlong/config.xml
+++ b/overlay-lineage/frameworks/base/core/res/res/values-sw820dp-notlong/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">
+    <!-- Set to true to enable the user switcher on the keyguard. -->
+    <bool name="config_keyguardUserSwitcher">false</bool>
+
+    <!-- If true, show multiuser switcher by default unless the user specifically disables it. -->
+    <bool name="config_showUserSwitcherByDefault">false</bool>
+</resources>
--- a/overlay-lineage/frameworks/base/core/res/res/values/config.xml
+++ b/overlay-lineage/frameworks/base/core/res/res/values/config.xml
@@ -24,9 +24,6 @@
     entries do not follow the convention, but all new entries should. -->

 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- IWLAN-->
-    <string name="config_qualified_networks_service_package">com.android.qns</string>
-
    <!-- If true, allows rotation resolver service to help resolve screen rotation. -->
    <bool name="config_allowRotationResolver">false</bool>

@@ -52,6 +49,7 @@
     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
@@ -60,6 +58,10 @@
        <item>4</item>
    </integer-array>

+    <!-- Indicates whether the window manager reacts to half-fold device states by overriding
+     rotation. -->
+    <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. -->
    <bool name="config_windowManagerPauseRotationWhenUnfolding">true</bool>
@@ -101,11 +103,15 @@
        <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
@@ -117,7 +123,7 @@

    <!-- Class name of the device specific implementation of DeviceStatePolicy.Provider
        or empty if the default should be used. -->
-    <string translatable="false" name="config_deviceSpecificDeviceStatePolicyProvider">com.google.android.server.policy.CometDeviceStatePolicyProvider</string>
+    <string name="config_deviceSpecificDeviceStatePolicyProvider" translatable="false">com.google.android.server.policy.CometDeviceStatePolicyProvider</string>

    <!-- Set to true to offset the wallpaper when using multiple displays so that it's centered
         at the same position as in the largest display.-->
@@ -128,12 +134,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
@@ -156,7 +163,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 name="config_fixedOrientationLetterboxAspectRatio" format="float" type="dimen">1.001</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
@@ -167,7 +174,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.
    -->
@@ -184,6 +191,9 @@
    <!-- Whether displaying letterbox education is enabled for letterboxed fullscreen apps. -->
    <bool name="config_letterboxIsEducationEnabled">true</bool>

+    <!-- Whether using split screen aspect ratio as a default aspect ratio for unresizable apps. -->
+    <bool name="config_letterboxIsSplitScreenAspectRatioForUnresizableAppsEnabled">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>
@@ -205,10 +215,6 @@
        split screen. -->
    <bool name="config_isWindowManagerCameraCompatTreatmentEnabled">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>
--- 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/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-sw600dp-land/config.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp-land/config.xml
@@ -0,0 +1,24 @@
+<?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 maximum number of tiles in the QuickQSPanel -->
+    <item name="quick_qs_panel_max_tiles" type="integer">@integer/comet_unfolded_quick_qs_panel_max_tiles</item>
+
+    <!-- The maximum number of rows in the QuickQSPanel -->
+    <item name="quick_qs_panel_max_rows" type="integer">@integer/comet_unfolded_quick_qs_panel_max_rows</item>
+
+    <!-- The number of columns in the QuickSettings -->
+    <item name="quick_settings_num_columns" type="integer">@integer/comet_unfolded_quick_settings_num_columns</item>
+
+    <!-- The number of rows in the QuickSettings -->
+    <item name="quick_settings_max_rows" type="integer">@integer/comet_unfolded_quick_settings_max_rows</item>
+
+    <!-- The number of rows in the paginated grid QuickSettings -->
+    <integer name="quick_settings_paginated_grid_num_rows">5</integer>
+
+    <!-- Whether to use the split 2-column notification shade -->
+    <item name="config_use_split_notification_shade" type="bool">@bool/comet_unfolded_config_use_split_notification_shade</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp-land/dimens.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp-land/dimens.xml
@@ -0,0 +1,61 @@
+<?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">
+    <item name="status_view_margin_horizontal" type="dimen">@dimen/comet_unfolded_status_view_margin_horizontal</item>
+
+    <!-- Side padding on the side of notifications -->
+    <item name="notification_side_paddings" type="dimen">@dimen/comet_unfolded_notification_side_paddings</item>
+
+    <!-- gap on either side of status bar notification icons -->
+    <item name="status_bar_icon_horizontal_margin" type="dimen">@dimen/comet_unfolded_status_bar_icon_horizontal_margin</item>
+
+    <!-- Height of status bar in split shade mode - visible only on large screens -->
+    <item name="large_screen_shade_header_height" type="dimen">@dimen/comet_unfolded_large_screen_shade_header_height</item>
+    <item name="large_screen_shade_header_left_padding" type="dimen">@dimen/comet_unfolded_large_screen_shade_header_left_padding</item>
+    <item name="notification_panel_margin_bottom" type="dimen">@dimen/comet_unfolded_notification_panel_margin_bottom</item>
+    <item name="split_shade_notifications_scrim_margin_bottom" type="dimen">@dimen/comet_unfolded_split_shade_notifications_scrim_margin_bottom</item>
+    <item name="notification_panel_margin_horizontal" type="dimen">@dimen/comet_unfolded_notification_panel_margin_horizontal</item>
+    <item name="qqs_layout_padding_bottom" type="dimen">@dimen/comet_unfolded_qqs_layout_padding_bottom</item>
+
+    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
+         aligned with notifications. The exception is split shade when this value becomes
+         independent  -->
+    <item name="qs_horizontal_margin" type="dimen">@dimen/comet_unfolded_qs_horizontal_margin</item>
+
+    <!-- Most of the time it should be the same as notification_shade_content_margin_horizontal as
+         it's vertically aligned with notifications. The exception is split shade when this value
+         becomes independent  -->
+    <item name="qs_content_horizontal_padding" type="dimen">@dimen/comet_unfolded_qs_content_horizontal_padding</item>
+
+    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
+        aligned with notifications. That's not the case on large screen when we have either split
+        shade and QS is not above notifications or in portrait shade when notification scrim is no
+        longer full width and next page of tiles should be at the edge of the screen -->
+    <item name="qs_tiles_page_horizontal_margin" type="dimen">@dimen/comet_unfolded_qs_tiles_page_horizontal_margin</item>
+
+    <!-- The height of the gap between adjacent notification sections. -->
+    <item name="notification_section_divider_height" type="dimen">@dimen/comet_unfolded_notification_section_divider_height</item>
+
+    <!-- The margin from the top of the screen to notifications and keyguard status view in
+         split shade on keyguard-->
+    <item name="keyguard_split_shade_top_margin" type="dimen">@dimen/comet_unfolded_keyguard_split_shade_top_margin</item>
+
+    <!-- Biometric Auth pattern view size, better to align keyguard_security_width -->
+    <item name="biometric_auth_pattern_view_size" type="dimen">@dimen/comet_unfolded_biometric_auth_pattern_view_size</item>
+    <item name="qs_media_session_height_expanded" type="dimen">@dimen/comet_unfolded_qs_media_session_height_expanded</item>
+    <item name="controls_header_horizontal_padding" type="dimen">@dimen/comet_unfolded_controls_header_horizontal_padding</item>
+    <item name="controls_content_margin_horizontal" type="dimen">@dimen/comet_unfolded_controls_content_margin_horizontal</item>
+    <item name="controls_content_padding" type="dimen">@dimen/comet_unfolded_controls_content_padding</item>
+    <item name="control_list_vertical_spacing" type="dimen">@dimen/comet_unfolded_control_list_vertical_spacing</item>
+    <item name="control_list_horizontal_spacing" type="dimen">@dimen/comet_unfolded_control_list_horizontal_spacing</item>
+    <item name="controls_panel_corner_radius" type="dimen">@dimen/comet_unfolded_controls_panel_corner_radius</item>
+
+    <!-- The amount of vertical offset for the keyguard during the full shade transition. -->
+    <item name="lockscreen_shade_keyguard_transition_vertical_offset" type="dimen">@dimen/comet_unfolded_lockscreen_shade_keyguard_transition_vertical_offset</item>
+
+    <!-- Maximum over scroll amount for the shade when transition to the full shade. -->
+    <item name="lockscreen_shade_max_over_scroll_amount" type="dimen">@dimen/comet_unfolded_lockscreen_shade_max_over_scroll_amount</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp-port/config.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp-port/config.xml
@@ -0,0 +1,24 @@
+<?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 maximum number of tiles in the QuickQSPanel -->
+    <item name="quick_qs_panel_max_tiles" type="integer">@integer/comet_unfolded_quick_qs_panel_max_tiles</item>
+
+    <!-- The maximum number of rows in the QuickQSPanel -->
+    <item name="quick_qs_panel_max_rows" type="integer">@integer/comet_unfolded_quick_qs_panel_max_rows</item>
+
+    <!-- The number of columns in the QuickSettings -->
+    <item name="quick_settings_num_columns" type="integer">@integer/comet_unfolded_quick_settings_num_columns</item>
+
+    <!-- The number of rows in the QuickSettings -->
+    <item name="quick_settings_max_rows" type="integer">@integer/comet_unfolded_quick_settings_max_rows</item>
+
+    <!-- The number of rows in the paginated grid QuickSettings -->
+    <integer name="quick_settings_paginated_grid_num_rows">5</integer>
+
+    <!-- Whether to use the split 2-column notification shade -->
+    <item name="config_use_split_notification_shade" type="bool">@bool/comet_unfolded_config_use_split_notification_shade</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp-port/dimens.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp-port/dimens.xml
@@ -0,0 +1,61 @@
+<?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">
+    <item name="status_view_margin_horizontal" type="dimen">@dimen/comet_unfolded_status_view_margin_horizontal</item>
+
+    <!-- Side padding on the side of notifications -->
+    <item name="notification_side_paddings" type="dimen">@dimen/comet_unfolded_notification_side_paddings</item>
+
+    <!-- gap on either side of status bar notification icons -->
+    <item name="status_bar_icon_horizontal_margin" type="dimen">@dimen/comet_unfolded_status_bar_icon_horizontal_margin</item>
+
+    <!-- Height of status bar in split shade mode - visible only on large screens -->
+    <item name="large_screen_shade_header_height" type="dimen">@dimen/comet_unfolded_large_screen_shade_header_height</item>
+    <item name="large_screen_shade_header_left_padding" type="dimen">@dimen/comet_unfolded_large_screen_shade_header_left_padding</item>
+    <item name="notification_panel_margin_bottom" type="dimen">@dimen/comet_unfolded_notification_panel_margin_bottom</item>
+    <item name="split_shade_notifications_scrim_margin_bottom" type="dimen">@dimen/comet_unfolded_split_shade_notifications_scrim_margin_bottom</item>
+    <item name="notification_panel_margin_horizontal" type="dimen">@dimen/comet_unfolded_notification_panel_margin_horizontal</item>
+    <item name="qqs_layout_padding_bottom" type="dimen">@dimen/comet_unfolded_qqs_layout_padding_bottom</item>
+
+    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
+         aligned with notifications. The exception is split shade when this value becomes
+         independent  -->
+    <item name="qs_horizontal_margin" type="dimen">@dimen/comet_unfolded_qs_horizontal_margin</item>
+
+    <!-- Most of the time it should be the same as notification_shade_content_margin_horizontal as
+         it's vertically aligned with notifications. The exception is split shade when this value
+         becomes independent  -->
+    <item name="qs_content_horizontal_padding" type="dimen">@dimen/comet_unfolded_qs_content_horizontal_padding</item>
+
+    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
+        aligned with notifications. That's not the case on large screen when we have either split
+        shade and QS is not above notifications or in portrait shade when notification scrim is no
+        longer full width and next page of tiles should be at the edge of the screen -->
+    <item name="qs_tiles_page_horizontal_margin" type="dimen">@dimen/comet_unfolded_qs_tiles_page_horizontal_margin</item>
+
+    <!-- The height of the gap between adjacent notification sections. -->
+    <item name="notification_section_divider_height" type="dimen">@dimen/comet_unfolded_notification_section_divider_height</item>
+
+    <!-- The margin from the top of the screen to notifications and keyguard status view in
+         split shade on keyguard-->
+    <item name="keyguard_split_shade_top_margin" type="dimen">@dimen/comet_unfolded_keyguard_split_shade_top_margin</item>
+
+    <!-- Biometric Auth pattern view size, better to align keyguard_security_width -->
+    <item name="biometric_auth_pattern_view_size" type="dimen">@dimen/comet_unfolded_biometric_auth_pattern_view_size</item>
+    <item name="qs_media_session_height_expanded" type="dimen">@dimen/comet_unfolded_qs_media_session_height_expanded</item>
+    <item name="controls_header_horizontal_padding" type="dimen">@dimen/comet_unfolded_controls_header_horizontal_padding</item>
+    <item name="controls_content_margin_horizontal" type="dimen">@dimen/comet_unfolded_controls_content_margin_horizontal</item>
+    <item name="controls_content_padding" type="dimen">@dimen/comet_unfolded_controls_content_padding</item>
+    <item name="control_list_vertical_spacing" type="dimen">@dimen/comet_unfolded_control_list_vertical_spacing</item>
+    <item name="control_list_horizontal_spacing" type="dimen">@dimen/comet_unfolded_control_list_horizontal_spacing</item>
+    <item name="controls_panel_corner_radius" type="dimen">@dimen/comet_unfolded_controls_panel_corner_radius</item>
+
+    <!-- The amount of vertical offset for the keyguard during the full shade transition. -->
+    <item name="lockscreen_shade_keyguard_transition_vertical_offset" type="dimen">@dimen/comet_unfolded_lockscreen_shade_keyguard_transition_vertical_offset</item>
+
+    <!-- Maximum over scroll amount for the shade when transition to the full shade. -->
+    <item name="lockscreen_shade_max_over_scroll_amount" type="dimen">@dimen/comet_unfolded_lockscreen_shade_max_over_scroll_amount</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp/config.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw600dp/config.xml
@@ -0,0 +1,10 @@
+<?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">
+    <!-- Allows PIN/Pattern to be drawn on one side of a display, and for the user to
+         switch sides -->
+    <bool name="can_use_one_handed_bouncer">true</bool>
+</resources>
--- 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,21 @@
+<?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 maximum number of tiles in the QuickQSPanel -->
+    <item name="quick_qs_panel_max_tiles" type="integer">@integer/comet_unfolded_quick_qs_panel_max_tiles</item>
+
+    <!-- The maximum number of rows in the QuickQSPanel -->
+    <item name="quick_qs_panel_max_rows" type="integer">@integer/comet_unfolded_quick_qs_panel_max_rows</item>
+
+    <!-- The number of columns in the QuickSettings -->
+    <item name="quick_settings_num_columns" type="integer">@integer/comet_unfolded_quick_settings_num_columns</item>
+
+    <!-- The number of rows in the QuickSettings -->
+    <item name="quick_settings_max_rows" type="integer">@integer/comet_unfolded_quick_settings_max_rows</item>
+
+    <!-- Whether to use the split 2-column notification shade -->
+    <item name="config_use_split_notification_shade" type="bool">@bool/comet_unfolded_config_use_split_notification_shade</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw720dp-land/dimens.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw720dp-land/dimens.xml
@@ -0,0 +1,61 @@
+<?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">
+    <item name="status_view_margin_horizontal" type="dimen">@dimen/comet_unfolded_status_view_margin_horizontal</item>
+
+    <!-- Side padding on the side of notifications -->
+    <item name="notification_side_paddings" type="dimen">@dimen/comet_unfolded_notification_side_paddings</item>
+
+    <!-- gap on either side of status bar notification icons -->
+    <item name="status_bar_icon_horizontal_margin" type="dimen">@dimen/comet_unfolded_status_bar_icon_horizontal_margin</item>
+
+    <!-- Height of status bar in split shade mode - visible only on large screens -->
+    <item name="large_screen_shade_header_height" type="dimen">@dimen/comet_unfolded_large_screen_shade_header_height</item>
+    <item name="large_screen_shade_header_left_padding" type="dimen">@dimen/comet_unfolded_large_screen_shade_header_left_padding</item>
+    <item name="notification_panel_margin_bottom" type="dimen">@dimen/comet_unfolded_notification_panel_margin_bottom</item>
+    <item name="split_shade_notifications_scrim_margin_bottom" type="dimen">@dimen/comet_unfolded_split_shade_notifications_scrim_margin_bottom</item>
+    <item name="notification_panel_margin_horizontal" type="dimen">@dimen/comet_unfolded_notification_panel_margin_horizontal</item>
+    <item name="qqs_layout_padding_bottom" type="dimen">@dimen/comet_unfolded_qqs_layout_padding_bottom</item>
+
+    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
+         aligned with notifications. The exception is split shade when this value becomes
+         independent  -->
+    <item name="qs_horizontal_margin" type="dimen">@dimen/comet_unfolded_qs_horizontal_margin</item>
+
+    <!-- Most of the time it should be the same as notification_shade_content_margin_horizontal as
+         it's vertically aligned with notifications. The exception is split shade when this value
+         becomes independent  -->
+    <item name="qs_content_horizontal_padding" type="dimen">@dimen/comet_unfolded_qs_content_horizontal_padding</item>
+
+    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
+        aligned with notifications. That's not the case on large screen when we have either split
+        shade and QS is not above notifications or in portrait shade when notification scrim is no
+        longer full width and next page of tiles should be at the edge of the screen -->
+    <item name="qs_tiles_page_horizontal_margin" type="dimen">@dimen/comet_unfolded_qs_tiles_page_horizontal_margin</item>
+
+    <!-- The height of the gap between adjacent notification sections. -->
+    <item name="notification_section_divider_height" type="dimen">@dimen/comet_unfolded_notification_section_divider_height</item>
+
+    <!-- The margin from the top of the screen to notifications and keyguard status view in
+         split shade on keyguard-->
+    <item name="keyguard_split_shade_top_margin" type="dimen">@dimen/comet_unfolded_keyguard_split_shade_top_margin</item>
+
+    <!-- Biometric Auth pattern view size, better to align keyguard_security_width -->
+    <item name="biometric_auth_pattern_view_size" type="dimen">@dimen/comet_unfolded_biometric_auth_pattern_view_size</item>
+    <item name="qs_media_session_height_expanded" type="dimen">@dimen/comet_unfolded_qs_media_session_height_expanded</item>
+    <item name="controls_header_horizontal_padding" type="dimen">@dimen/comet_unfolded_controls_header_horizontal_padding</item>
+    <item name="controls_content_margin_horizontal" type="dimen">@dimen/comet_unfolded_controls_content_margin_horizontal</item>
+    <item name="controls_content_padding" type="dimen">@dimen/comet_unfolded_controls_content_padding</item>
+    <item name="control_list_vertical_spacing" type="dimen">@dimen/comet_unfolded_control_list_vertical_spacing</item>
+    <item name="control_list_horizontal_spacing" type="dimen">@dimen/comet_unfolded_control_list_horizontal_spacing</item>
+    <item name="controls_panel_corner_radius" type="dimen">@dimen/comet_unfolded_controls_panel_corner_radius</item>
+
+    <!-- The amount of vertical offset for the keyguard during the full shade transition. -->
+    <item name="lockscreen_shade_keyguard_transition_vertical_offset" type="dimen">@dimen/comet_unfolded_lockscreen_shade_keyguard_transition_vertical_offset</item>
+
+    <!-- Maximum over scroll amount for the shade when transition to the full shade. -->
+    <item name="lockscreen_shade_max_over_scroll_amount" type="dimen">@dimen/comet_unfolded_lockscreen_shade_max_over_scroll_amount</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw720dp-port/config.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw720dp-port/config.xml
@@ -0,0 +1,21 @@
+<?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 maximum number of tiles in the QuickQSPanel -->
+    <item name="quick_qs_panel_max_tiles" type="integer">@integer/comet_unfolded_quick_qs_panel_max_tiles</item>
+
+    <!-- The maximum number of rows in the QuickQSPanel -->
+    <item name="quick_qs_panel_max_rows" type="integer">@integer/comet_unfolded_quick_qs_panel_max_rows</item>
+
+    <!-- The number of columns in the QuickSettings -->
+    <item name="quick_settings_num_columns" type="integer">@integer/comet_unfolded_quick_settings_num_columns</item>
+
+    <!-- The number of rows in the QuickSettings -->
+    <item name="quick_settings_max_rows" type="integer">@integer/comet_unfolded_quick_settings_max_rows</item>
+
+    <!-- Whether to use the split 2-column notification shade -->
+    <item name="config_use_split_notification_shade" type="bool">@bool/comet_unfolded_config_use_split_notification_shade</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw720dp-port/dimens.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values-sw720dp-port/dimens.xml
@@ -0,0 +1,61 @@
+<?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">
+    <item name="status_view_margin_horizontal" type="dimen">@dimen/comet_unfolded_status_view_margin_horizontal</item>
+
+    <!-- Side padding on the side of notifications -->
+    <item name="notification_side_paddings" type="dimen">@dimen/comet_unfolded_notification_side_paddings</item>
+
+    <!-- gap on either side of status bar notification icons -->
+    <item name="status_bar_icon_horizontal_margin" type="dimen">@dimen/comet_unfolded_status_bar_icon_horizontal_margin</item>
+
+    <!-- Height of status bar in split shade mode - visible only on large screens -->
+    <item name="large_screen_shade_header_height" type="dimen">@dimen/comet_unfolded_large_screen_shade_header_height</item>
+    <item name="large_screen_shade_header_left_padding" type="dimen">@dimen/comet_unfolded_large_screen_shade_header_left_padding</item>
+    <item name="notification_panel_margin_bottom" type="dimen">@dimen/comet_unfolded_notification_panel_margin_bottom</item>
+    <item name="split_shade_notifications_scrim_margin_bottom" type="dimen">@dimen/comet_unfolded_split_shade_notifications_scrim_margin_bottom</item>
+    <item name="notification_panel_margin_horizontal" type="dimen">@dimen/comet_unfolded_notification_panel_margin_horizontal</item>
+    <item name="qqs_layout_padding_bottom" type="dimen">@dimen/comet_unfolded_qqs_layout_padding_bottom</item>
+
+    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
+         aligned with notifications. The exception is split shade when this value becomes
+         independent  -->
+    <item name="qs_horizontal_margin" type="dimen">@dimen/comet_unfolded_qs_horizontal_margin</item>
+
+    <!-- Most of the time it should be the same as notification_shade_content_margin_horizontal as
+         it's vertically aligned with notifications. The exception is split shade when this value
+         becomes independent  -->
+    <item name="qs_content_horizontal_padding" type="dimen">@dimen/comet_unfolded_qs_content_horizontal_padding</item>
+
+    <!-- Most of the time it should be the same as notification_side_paddings as it's vertically
+        aligned with notifications. That's not the case on large screen when we have either split
+        shade and QS is not above notifications or in portrait shade when notification scrim is no
+        longer full width and next page of tiles should be at the edge of the screen -->
+    <item name="qs_tiles_page_horizontal_margin" type="dimen">@dimen/comet_unfolded_qs_tiles_page_horizontal_margin</item>
+
+    <!-- The height of the gap between adjacent notification sections. -->
+    <item name="notification_section_divider_height" type="dimen">@dimen/comet_unfolded_notification_section_divider_height</item>
+
+    <!-- The margin from the top of the screen to notifications and keyguard status view in
+         split shade on keyguard-->
+    <item name="keyguard_split_shade_top_margin" type="dimen">@dimen/comet_unfolded_keyguard_split_shade_top_margin</item>
+
+    <!-- Biometric Auth pattern view size, better to align keyguard_security_width -->
+    <item name="biometric_auth_pattern_view_size" type="dimen">@dimen/comet_unfolded_biometric_auth_pattern_view_size</item>
+    <item name="qs_media_session_height_expanded" type="dimen">@dimen/comet_unfolded_qs_media_session_height_expanded</item>
+    <item name="controls_header_horizontal_padding" type="dimen">@dimen/comet_unfolded_controls_header_horizontal_padding</item>
+    <item name="controls_content_margin_horizontal" type="dimen">@dimen/comet_unfolded_controls_content_margin_horizontal</item>
+    <item name="controls_content_padding" type="dimen">@dimen/comet_unfolded_controls_content_padding</item>
+    <item name="control_list_vertical_spacing" type="dimen">@dimen/comet_unfolded_control_list_vertical_spacing</item>
+    <item name="control_list_horizontal_spacing" type="dimen">@dimen/comet_unfolded_control_list_horizontal_spacing</item>
+    <item name="controls_panel_corner_radius" type="dimen">@dimen/comet_unfolded_controls_panel_corner_radius</item>
+
+    <!-- The amount of vertical offset for the keyguard during the full shade transition. -->
+    <item name="lockscreen_shade_keyguard_transition_vertical_offset" type="dimen">@dimen/comet_unfolded_lockscreen_shade_keyguard_transition_vertical_offset</item>
+
+    <!-- Maximum over scroll amount for the shade when transition to the full shade. -->
+    <item name="lockscreen_shade_max_over_scroll_amount" type="dimen">@dimen/comet_unfolded_lockscreen_shade_max_over_scroll_amount</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values/bools.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values/bools.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">
+    <add-resource name="comet_unfolded_config_use_split_notification_shade" type="bool" />
+    <bool name="comet_unfolded_config_use_split_notification_shade">true</bool>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values/config.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">
+    <!-- The number of rows in the QuickSettings -->
+    <integer name="quick_settings_max_rows">5</integer>
+
+    <!-- The number of rows in the paginated grid QuickSettings -->
+    <integer name="quick_settings_paginated_grid_num_rows">5</integer>
+
+    <!-- Flag to activate notification to contents feature -->
+    <bool name="config_notificationToContents">true</bool>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -0,0 +1,55 @@
+<?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">
+    <add-resource name="comet_unfolded_biometric_auth_pattern_view_size" type="dimen" />
+    <dimen name="comet_unfolded_biometric_auth_pattern_view_size">348.0dip</dimen>
+    <add-resource name="comet_unfolded_control_list_horizontal_spacing" type="dimen" />
+    <dimen name="comet_unfolded_control_list_horizontal_spacing">16.0dip</dimen>
+    <add-resource name="comet_unfolded_control_list_vertical_spacing" type="dimen" />
+    <dimen name="comet_unfolded_control_list_vertical_spacing">8.0dip</dimen>
+    <add-resource name="comet_unfolded_controls_content_margin_horizontal" type="dimen" />
+    <dimen name="comet_unfolded_controls_content_margin_horizontal">24.0dip</dimen>
+    <add-resource name="comet_unfolded_controls_content_padding" type="dimen" />
+    <dimen name="comet_unfolded_controls_content_padding">24.0dip</dimen>
+    <add-resource name="comet_unfolded_controls_header_horizontal_padding" type="dimen" />
+    <dimen name="comet_unfolded_controls_header_horizontal_padding">12.0dip</dimen>
+    <add-resource name="comet_unfolded_controls_panel_corner_radius" type="dimen" />
+    <dimen name="comet_unfolded_controls_panel_corner_radius">42.0dip</dimen>
+    <add-resource name="comet_unfolded_keyguard_split_shade_top_margin" type="dimen" />
+    <dimen name="comet_unfolded_keyguard_split_shade_top_margin">68.0dip</dimen>
+    <add-resource name="comet_unfolded_large_screen_shade_header_height" type="dimen" />
+    <dimen name="comet_unfolded_large_screen_shade_header_height">42.0dip</dimen>
+    <add-resource name="comet_unfolded_lockscreen_shade_keyguard_transition_vertical_offset" type="dimen" />
+    <dimen name="comet_unfolded_lockscreen_shade_keyguard_transition_vertical_offset">83.0dip</dimen>
+    <add-resource name="comet_unfolded_lockscreen_shade_max_over_scroll_amount" type="dimen" />
+    <dimen name="comet_unfolded_lockscreen_shade_max_over_scroll_amount">32.0dip</dimen>
+    <add-resource name="comet_unfolded_notification_panel_margin_bottom" type="dimen" />
+    <dimen name="comet_unfolded_notification_panel_margin_bottom">48.0dip</dimen>
+    <add-resource name="comet_unfolded_notification_panel_margin_horizontal" type="dimen" />
+    <dimen name="comet_unfolded_notification_panel_margin_horizontal">24.0dip</dimen>
+    <add-resource name="comet_unfolded_notification_side_paddings" type="dimen" />
+    <dimen name="comet_unfolded_notification_side_paddings">16.0dip</dimen>
+    <add-resource name="comet_unfolded_qqs_layout_padding_bottom" type="dimen" />
+    <dimen name="comet_unfolded_qqs_layout_padding_bottom">16.0dip</dimen>
+    <add-resource name="comet_unfolded_qs_content_horizontal_padding" type="dimen" />
+    <dimen name="comet_unfolded_qs_content_horizontal_padding">24.0dip</dimen>
+    <add-resource name="comet_unfolded_qs_horizontal_margin" type="dimen" />
+    <dimen name="comet_unfolded_qs_horizontal_margin">24.0dip</dimen>
+    <add-resource name="comet_unfolded_qs_media_session_height_expanded" type="dimen" />
+    <dimen name="comet_unfolded_qs_media_session_height_expanded">172.0dip</dimen>
+    <add-resource name="comet_unfolded_qs_tiles_page_horizontal_margin" type="dimen" />
+    <dimen name="comet_unfolded_qs_tiles_page_horizontal_margin">12.0dip</dimen>
+    <add-resource name="comet_unfolded_split_shade_notifications_scrim_margin_bottom" type="dimen" />
+    <dimen name="comet_unfolded_split_shade_notifications_scrim_margin_bottom">16.0dip</dimen>
+    <add-resource name="comet_unfolded_status_bar_icon_horizontal_margin" type="dimen" />
+    <dimen name="comet_unfolded_status_bar_icon_horizontal_margin">0.0sp</dimen>
+    <add-resource name="comet_unfolded_status_view_margin_horizontal" type="dimen" />
+    <dimen name="comet_unfolded_status_view_margin_horizontal">8.0dip</dimen>
+    <add-resource name="comet_unfolded_large_screen_shade_header_left_padding" type="dimen" />
+    <item name="comet_unfolded_large_screen_shade_header_left_padding" type="dimen">@dimen/qs_horizontal_margin</item>
+    <add-resource name="comet_unfolded_notification_section_divider_height" type="dimen" />
+    <item name="comet_unfolded_notification_section_divider_height" type="dimen">@dimen/notification_side_paddings</item>
+</resources>
--- a/overlay-lineage/frameworks/base/packages/SystemUI/res/values/integers.xml
+++ b/overlay-lineage/frameworks/base/packages/SystemUI/res/values/integers.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">
+    <add-resource name="comet_unfolded_quick_qs_panel_max_rows" type="integer" />
+    <integer name="comet_unfolded_quick_qs_panel_max_rows">2</integer>
+    <add-resource name="comet_unfolded_quick_qs_panel_max_tiles" type="integer" />
+    <integer name="comet_unfolded_quick_qs_panel_max_tiles">4</integer>
+    <add-resource name="comet_unfolded_quick_settings_max_rows" type="integer" />
+    <integer name="comet_unfolded_quick_settings_max_rows">5</integer>
+    <add-resource name="comet_unfolded_quick_settings_num_columns" type="integer" />
+    <integer name="comet_unfolded_quick_settings_num_columns">2</integer>
+</resources>
--- a/overlay-lineage/packages/apps/Settings/res/values/config.xml
+++ b/overlay-lineage/packages/apps/Settings/res/values/config.xml
@@ -49,7 +49,7 @@
    </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>

    <!-- The smallest value of current width of the window when the split should be used. -->
    <integer name="config_activity_embed_split_min_cur_dp">600</integer>
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -59,7 +59,7 @@
        "1000",
        "500"
      ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 3,
      "ResetOnInit": true
    },
    {
@@ -110,7 +110,7 @@
        "2000",
        "500"
      ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 4,
      "ResetOnInit": true
    },
    {
@@ -162,7 +162,7 @@
        "2000",
        "500"
      ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 3,
      "ResetOnInit": true
    },
    {
@@ -243,7 +243,7 @@
        "0",
        "1"
      ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
      "ResetOnInit": true
    },
    {
@@ -253,7 +253,7 @@
        "0",
        "1"
      ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
      "ResetOnInit": true
    },
    {
@@ -287,7 +287,7 @@
        "7",
        "8"
      ],
-      "DefaultIndex": 4,
+      "DefaultIndex": 8,
      "ResetOnInit": true
    },
    {
@@ -297,7 +297,7 @@
        "0",
        "512"
      ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
      "ResetOnInit": true
    },
    {
@@ -888,6 +888,26 @@
      "ResetOnInit": true,
      "Type": "Property"
    },
+    {
+      "Name": "ntc_critical_trip",
+      "Path": "/dev/thermal/tz-by-name/charger_therm/trip_point_1_temp",
+      "Values": [
+        "64000",
+        "72000"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
+    {
+      "Name": "ntc_hot_trip",
+      "Path": "/dev/thermal/tz-by-name/charger_therm/trip_point_2_temp",
+      "Values": [
+        "66000",
+        "74000"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true
+    },
    {
      "Name": "MIFTargetLoad",
      "Path": "/sys/class/devfreq/17000010.devfreq_mif/interactive/target_load",
@@ -993,6 +1013,16 @@
      "WriteOnly": true,
      "ResetOnInit": false
    },
+    {
+      "Name": "AAModeProperty",
+      "Path": "vendor.powerhal.mode.aa",
+      "Values": [
+        "1",
+        "0"
+      ],
+      "ResetOnInit": true,
+      "Type": "Property"
+    },
    {
      "Name": "KswapdUclaimMin",
      "Path": "/sys/kernel/vendor_mm/kswapd_uclamp_min",
@@ -1011,6 +1041,16 @@
      ],
      "DefaultIndex": 0,
      "ResetOnInit": true
+    },
+    {
+      "Name": "SYSTEM_UI_ADPF_PROFILES",
+      "Path": "<AdpfConfig>:SYSTEM_UI",
+      "Values": [
+        "SYSTEM_UI_PROFILE"
+      ],
+      "DefaultIndex": 0,
+      "ResetOnInit": true,
+      "Type": "Event"
    }
  ],
  "Actions": [
@@ -1351,7 +1391,7 @@
    {
      "PowerHint": "LAUNCH",
      "Node": "TARampupMultiplier",
-      "Duration": 0,
+      "Duration": 5000,
      "Value": "4"
    },
    {
@@ -1447,7 +1487,7 @@
    {
      "PowerHint": "LAUNCH_EXTEND",
      "Node": "TARampupMultiplier",
-      "Duration": 0,
+      "Duration": 2000,
      "Value": "4"
    },
    {
@@ -3204,20 +3244,8 @@
      "Value": "1"
    },
    {
-      "PowerHint": "REFRESH_120FPS",
-      "Node": "TAUClampBoost",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "REFRESH_60FPS",
-      "Node": "TAUClampBoost",
-      "Duration": 0,
-      "Value": "1"
-    },
-    {
-      "PowerHint": "ADPF_DISABLE_TA_BOOST",
-      "Node": "TAUClampBoost",
+      "PowerHint": "AUTOMOTIVE_PROJECTION",
+      "Node": "AAModeProperty",
      "Duration": 0,
      "Value": "1"
    },
@@ -3262,6 +3290,18 @@
      "Duration": 0,
      "Value": "170"
    },
+    {
+      "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": "CPULittleClusterDownRateLimitUs",
@@ -3406,6 +3446,18 @@
      "Duration": 0,
      "Value": "1"
    },
+    {
+      "PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
+      "Node": "ntc_critical_trip",
+      "Duration": 0,
+      "Value": "72000"
+    },
+    {
+      "PowerHint": "THERMAL_ShutdownMode_EMERGENCY",
+      "Node": "ntc_hot_trip",
+      "Duration": 0,
+      "Value": "74000"
+    },
    {
      "PowerHint": "GAME",
      "Node": "PMU_POLL",
@@ -3482,13 +3534,15 @@
      "PowerHint": "GAME",
      "Node": "AutoMigrationMarginsEnable",
      "Duration": 0,
-      "Value": "1"
+      "Value": "1",
+      "EnableProperty": "vendor.powerhal.amm_enabled"
    },
    {
      "PowerHint": "GAME",
      "Node": "AutoDvfsHeadroomEnable",
      "Duration": 0,
-      "Value": "1"
+      "Value": "1",
+      "EnableProperty": "vendor.powerhal.amm_enabled"
    },
    {
      "PowerHint": "GAME",
@@ -3807,6 +3861,18 @@
      "Node": "MIFTargetLoad",
      "Duration": 0,
      "Value": "20 80"
+    },
+    {
+      "PowerHint": "DISABLE_AMM",
+      "Node": "AutoMigrationMarginsEnable",
+      "Duration": 0,
+      "Value": "0"
+    },
+    {
+      "PowerHint": "DISABLE_AMM",
+      "Node": "AutoDvfsHeadroomEnable",
+      "Duration": 0,
+      "Value": "0"
    }
  ],
  "GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
@@ -3926,79 +3992,42 @@
      "GpuCapacityBoostMax": 25000
    },
    {
-      "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": 0.5,
+      "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": 196,
-      "UclampMin_Low": 196,
+      "UclampMin_Init": 231,
+      "UclampMin_LoadUp": 730,
+      "UclampMin_LoadReset": 730,
+      "UclampMin_High": 480,
+      "UclampMin_Low": 2,
      "UclampMax_EfficientBase": 500,
      "UclampMax_EfficientOffset": 200,
-      "ReportingRateLimitNs": 1,
-      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0,
-      "GpuBoost": false
-    },
-    {
-      "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,
      "SamplingWindow_P": 1,
-      "SamplingWindow_I": 1,
+      "SamplingWindow_I": 0,
      "SamplingWindow_D": 1,
-      "UclampMin_On": true,
-      "UclampMin_Init": 250,
-      "UclampMin_High": 52,
-      "UclampMin_Low": 52,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
-      "ReportingRateLimitNs": 1,
+      "ReportingRateLimitNs": 166666660,
      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0,
-      "GpuBoost": false
-    },
-    {
-      "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,
-      "UclampMax_EfficientBase": 500,
-      "UclampMax_EfficientOffset": 200,
-      "ReportingRateLimitNs": 1,
-      "TargetTimeFactor": 1.0,
-      "StaleTimeFactor": 5.0,
-      "GpuBoost": false
+      "StaleTimeFactor": 15.0,
+      "HeuristicBoost_On": true,
+      "HBoostModerateJankThreshold": 2,
+      "HBoostOffMaxAvgDurRatio": 4.0,
+      "HBoostSevereJankPidPu": 0.3,
+      "HBoostSevereJankThreshold": 8,
+      "HBoostUclampMinCeilingRange": [480, 722],
+      "HBoostUclampMinFloorRange": [230, 410],
+      "JankCheckTimeFactor": 1.2,
+      "LowFrameRateThreshold": 25,
+      "MaxRecordsNum": 300,
+      "GpuBoost": true,
+      "GpuCapacityBoostMax": 25000
    }
  ]
 }
--- 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/UwbOverlay/Android.bp
+++ b/rro_overlays/UwbOverlay/Android.bp
@@ -14,5 +14,13 @@ runtime_resource_overlay {
    theme: "UwbOverlayCT3",
    certificate: "platform",
    sdk_version: "current",
-    product_specific: true
+    product_specific: true,
+}
+
+runtime_resource_overlay {
+    name: "UwbOverlayCT3Gsi",
+    theme: "UwbOverlayCT3",
+    certificate: "platform",
+    sdk_version: "current",
+    vendor: true,
 }
--- 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/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/self-extractors/PROLOGUE
+++ b/self-extractors/PROLOGUE
@@ -1,2 +0,0 @@
-#!/bin/bash
-#
--- a/self-extractors/extract-lists.txt
+++ b/self-extractors/extract-lists.txt
@@ -1,15 +0,0 @@
-  google_devices)
-    TO_EXTRACT="\
-            IMAGES/vbmeta_vendor.img \
-            IMAGES/vendor.img \
-            IMAGES/vendor_dlkm.img \
-            RADIO/bootloader.img \
-            RADIO/radio.img \
-            system_ext/etc/permissions/com.shannon.imsservice.xml \
-            system_ext/etc/permissions/com.shannon.rcsservice.xml \
-            system_ext/lib64/libmediaadaptor.so \
-            system_ext/priv-app/ShannonRcs/ShannonRcs.apk \
-            system_ext/priv-app/ShannonIms/ShannonIms.apk \
-            "
-    ;;
-
--- a/self-extractors/google_devices/COPYRIGHT
+++ b/self-extractors/google_devices/COPYRIGHT
@@ -1 +0,0 @@
-# (C) Google Inc.
--- a/self-extractors/google_devices/LICENSE
+++ b/self-extractors/google_devices/LICENSE
@@ -1,264 +0,0 @@
-THIS DEVELOPER SOFTWARE LICENSE AGREEMENT (THE "AGREEMENT") IS A LEGALLY
-BINDING AGREEMENT BETWEEN Google Inc. ("LICENSOR") AND
-YOU OR THE LEGAL ENTITY YOU REPRESENT ("You" or its possessive, "Your"). BY
-TYPING "I ACCEPT" WHERE INDICATED YOU ACKNOWLEDGE THAT YOU HAVE READ THIS
-AGREEMENT, UNDERSTAND IT AND AGREE TO BE BOUND BY ITS TERMS AND CONDITIONS.
-IF YOU DO NOT AGREE TO THESE TERMS YOU MUST DISCONTINUE THE INSTALLATION
-PROCESS AND YOU SHALL NOT USE THE SOFTWARE OR RETAIN ANY COPIES OF THE
-SOFTWARE OR DOCUMENTATION. ANY USE OR POSSESSION OF THE SOFTWARE BY YOU IS
-SUBJECT TO THE TERMS AND CONDITIONS SET FORTH IN THIS AGREEMENT. IF THE
-SOFTWARE IS INSTALLED ON A COMPUTER OWNED BY A CORPORATION OR OTHER LEGAL
-ENTITY, THEN YOU REPRESENT AND WARRANT THAT YOU HAVE THE AUTHORITY TO BIND
-SUCH ENTITY TO THE TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-   1.  Special Definitions
-
-      a.  The term "Android" means the open source mobile platform, software
-          stack, operating system, middleware, application programming
-          interfaces and mobile applications under the trade-name "Android"
-          distributed at Android.com.
-
-      b.  The term "Android Applications" means a software application or
-          open-source contribution developed by You, designed to operate with
-          Android that does not contain or incorporate any of the Software.
-
-      c.  The term "Authorized Android Enabled Device" means only the device
-          identified on the site from which You downloaded the Software.
-          The term "Software" means the Licensor's proprietary software and
-          libraries in object code form, designed for use on the Authorized
-          Android Enabled Device.
-
-      d.  The term "Authorized Android Enabled Device Software" means a
-          packaged build for Authorized Android Enabled Devices, consisting
-          of files suitable for installation on an Authorized Android Enabled
-          Device using a mechanism such as fastboot mode or recovery mode.
-
-   2.  License Grant
-
-      a.  Subject to the terms of this Agreement, Licensor hereby grants to
-          You, free of charge, a non-exclusive, non-sublicensable,
-          non-transferable, limited copyright license, during the term of
-          this Agreement, to download, install and use the Software
-          internally in machine-readable (i.e., object code) form and the
-          Documentation for non-commercial use on an Authorized Android
-          Enabled Device and non-commercial redistribution for academic
-          purposes only of a reasonable number of copies of the Authorized
-          Android Enabled Device Software (the "Limited Purpose"). You may
-          grant your end users the right to use the Software for
-          non-commercial purposes on an Authorized Android Enabled Device.
-          The license to the Software granted to You hereunder is solely for
-          the Limited Purpose set forth in this section, and the Software
-          shall not be used for any other purpose.
-
-   3.  Restrictions
-
-      a.  Retention of Rights. The entire right, title and interest in the
-          Software shall remain with Licensor and, unless specified in
-          writing hereunder, no rights are granted to any of the Software.
-          Except for the right to use the Software for the Limited Purpose,
-          the delivery of the Software to You does not convey to You any
-          intellectual property rights in the Software, including, but not
-          limited to any rights under any patent, trademark, copyright, or
-          trade secret. Neither the delivery of the Software to You nor any
-          terms set forth herein shall be construed to grant to You, either
-          expressly, by implication or by way of estoppel, any license under
-          any patents or other intellectual property rights covering or
-          relating to any other product or invention or any combination of
-          the Software with any other product. Any rights not expressly
-          granted to You herein are reserved by Licensor.
-
-      b.  No Commercialization or Distribution of the Software and
-          Documentation. Except as expressly provided in Section 2 of this
-          Agreement, You shall have no right to (i) copy, disclose,
-          distribute, publically perform, publically display, transfer,
-          alter, modify, translate, disassemble, decompile, reverse engineer,
-          or adapt the Software and Documentation, or any portion thereof, or
-          create any derivative works based thereon; (ii) rent, lease,
-          assign, sublicense, resell, disclose or otherwise transfer the
-          Software and Documentation in whole or in part to any third party
-          (iii) use the Software and Documentation except for the Limited
-          Purpose, (iv) remove or alter any of the copyright or proprietary
-          notices contained in any of the Software and Documentation. For the
-          purposes of clarity, nothing in this Agreement prohibits You from
-          making and distributing Android Applications under commercial or
-          non-commercial terms, provided that You shall not contain,
-          incorporate, and/or compile the Software or any of its derivative
-          works, in whole or in part, into Your Android Applications and/or
-          any software/devices created by You or by third parties acting on
-          Your behalf. You and any such third party shall comply with all of
-          the terms and conditions of this Agreement.
-
-      c.  No Reverse Engineering. Except for any portions of the Software
-          provided to You in source code format and except for any third
-          party code distributed with the Software that is licensed under
-          contrary terms, You will not reverse engineer, disassemble,
-          decompile, or translate the Software, or otherwise attempt to
-          derive the source code version of the Software, except if and to
-          the extent expressly permitted under any applicable law.
-
-      d.  Third Party Software. You agree that Android may contain third
-          party software. You agree that you may not distribute such third
-          party software for any purpose without appropriate licenses from
-          the applicable third party or parties.
-
-      e.  No Transfer or Assignment. You shall not assign any of its rights
-          or obligations under this Agreement. Any attempted assignment in
-          contravention of this Section shall be void.
-
-      f.  Licensor shall retain all title, ownership and Intellectual
-          Property Rights in and to the Software and any derivative thereof.
-          "Intellectual Property Rights" shall mean all patent, copyright,
-          trade secret, trademark and other proprietary and intellectual
-          property rights, including moral rights.
-
-      g.  Neither this Agreement, nor any act by Licensor or its Affiliates
-          persuant to this Agreement or relating to the Software (including,
-          without limitation, the provision by Licensor or its Affiliates of
-          the Software) shall provide to You any license or any other rights
-          whatsoever under any patents, trademarks, trade secrets, copyrights
-          or any other intellectual property rights of Licensor or its
-          Affiliates, except for the copyrights expressly set forth in this
-          Agreement. You understand and agree that:
-
-      h.  Neither this Agreement, nor delivery of the Software alone or in
-          combination with any Licensor ASIC grants you any right to
-          practice, or any other right at all with respect to, any patent of
-          Licensor or its Affiliates, and
-
-      i.  A separating license agreement from Motorola Incorporated is needed
-          to use or practice any patent of Licensor or its Affiliates.
-
-      j.  You agree not to contend in any context that, as a result of the
-          provision or use of this software, either Licensor or Affiliate has
-          any obligation to extend, or Licensor or any other party has
-          obtained any right to, any license, whether express or implied,
-          with respect to any patent of Licensor or its Affiliates for any
-          purpose. For the purposes of this agreement, "Affiliate" means
-          (i) any corporation or any other legal entity that owns, directly
-          or indirectly, more than fifty percent (50%) of the shares, equity
-          interest or other securities of any entity entitled to vote for
-          election of directors (or other managing authority), or (ii) any
-          corporation or any other legal entity fifty percent (50%) or more
-          of whose shares, equity interest, or other securities entitled to
-          vote for election of directors (or other managing authority) is
-          owned or controlled by an entity, either directly or indirectly.
-
-   4.  Indemnity
-
-      a.  You agree to indemnify and hold harmless Licensor, Google, and
-          their officers, directors, customers, employees and successors and
-          assigns (each an "Indemnified Party") against any and all claims,
-          demands, causes of action, losses, liabilities, damages, costs and
-          expenses, incurred by the Indemnified Party (including but not
-          limited to costs of defense, investigation and reasonable
-          attorney's fees) arising out of, resulting from or related to
-          (i) any software, products, documentation, content, materials or
-          derivative works created or developed by You using the Software
-          which causes an infringement of any patent, copyright, trademark,
-          trade secret, or other property, publicity or privacy rights of any
-          third parties arising in any jurisdiction anywhere in the world,
-          (ii) the download, distribution, installation, storage, execution,
-          use or transfer of such software, products, documentation, content,
-          materials or derivative works by any person or entity, and/or
-          (iii) any breach of this Agreement by You. If requested by an
-          Indemnified Party, You agree to defend such Indemnified Party in
-          connection with any third party claims, demands, or causes of
-          action resulting from, arising out of or in connection with any of
-          the foregoing.
-
-   5.  Limitation of Liability
-
-      a.  TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE LAWS, UNDER NO
-          CIRCUMSTANCES, INCLUDING WITHOUT LIMITATION NEGLIGENCE, SHALL
-          LICENSOR, GOOGLE, THEIR AFFILIATES AND/OR ITS DIRECTORS, OFFICERS,
-          EMPLOYEES OR AGENTS BE LIABLE FOR ANY INDIRECT, INCIDENTAL,
-          SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES (INCLUDING BUT NOT
-          LIMITED TO DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS
-          INTERRUPTION, LOSS OF BUSINESS INFORMATION AND THE LIKE) ARISING
-          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR ANY DOWNLOAD,
-          INSTALLATION OR USE OF, OR INABILITY TO USE, THE SOFTWARE, EVEN IF
-          LICENSOR OR GOOGLE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH
-          DAMAGES. SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OR
-          EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES SO
-          THE ABOVE LIMITATION OR EXCLUSION MAY NOT APPLY OR MAY BE LIMITED.
-          IN NO EVENT SHALL LICENSOR'S OR GOOGLE'S TOTAL AGGREGATE LIABILITY
-          TO YOU FOR ANY AND ALL DAMAGES, LOSSES, CLAIMS AND CAUSES OF
-          ACTIONS (WHETHER IN CONTRACT, TORT, INCLUDING NEGLIGENCE,
-          INDEMNIFICATION OR OTHERWISE) EXCEED ONE HUNDRED U.S. DOLLARS
-          (US$100). THE LIMITATIONS SET FORTH IN THIS PARAGRAPH SHALL BE
-          DEEMED TO APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW.
-          THE PARTIES HAVE FULLY CONSIDERED THE FOREGOING ALLOCATION OF RISK
-          AND FIND IT REASONABLE, AND THAT THE FOREGOING LIMITATIONS IN THIS
-          PARAGRAPH ARE AN ESSENTIAL BASIS OF THE BARGAIN BETWEEN THE
-          PARTIES.
-
-   6.  No Warranty
-
-      a.  LICENSOR AND GOOGLE MAKE NO WARRANTIES, EXPRESS OR IMPLIED, WITH
-          RESPECT TO THE SOFTWARE AND DOCUMENTATION PROVIDED UNDER THIS
-          AGREEMENT, INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF
-          MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE OR AGAINST
-          INFRINGEMENT, OR ANY EXPRESS OR IMPLIED WARRANTY ARISING OUT OF
-          TRADE USAGE OR OUT OF A COURSE OF DEALING OR COURSE OF PERFORMANCE.
-          NOTHING CONTAINED IN THIS AGREEMENT SHALL BE CONSTRUED AS A
-          WARRANTY OR REPRESENTATION BY LICENSOR (I) AS TO THE VALIDITY OR
-          SCOPE OF ANY PATENT, COPYRIGHT OR OTHER INTELLECTUAL PROPERTY RIGHT
-          AND (II) THAT ANY MANUFACTURE OR USE WILL BE FREE FROM INFRINGEMENT
-          OF PATENTS, COPYRIGHTS OR OTHER INTELLECTUAL PROPERTY RIGHTS OF
-          OTHERS, AND IT SHALL BE THE SOLE RESPONSIBILITY OF YOU TO MAKE SUCH
-          DETERMINATION AS IS NECESSARY WITH RESPECT TO THE ACQUISITION OF
-          LICENSES UNDER PATENTS AND OTHER INTELLECTUAL PROPERTY OF THIRD
-          PARTIES. LICENSOR AND GOOGLE SHALL NOT HAVE ANY OBLIGATION TO
-          PROVIDE ANY TECHNICAL SUPPORT OF THE SOFTWARE UNDER THIS AGREEMENT.
-
-   7.  Term and Termination
-
-      a.  This Agreement shall be effective on the date You accept this
-          Agreement and shall remain in effect until terminated as provided
-          herein. You may terminate the Agreement at any time by deleting and
-          destroying all copies of the Software and all related information
-          in Your possession or control. This Agreement terminates
-          immediately and automatically, with or without notice, if You fail
-          to comply with any provision hereof. Additionally, Licensor may at
-          any time terminate this Agreement, without cause, upon notice to
-          You. Upon termination You must delete or destroy all copies of the
-          Software in Your possession, and the license granted to You in this
-          Agreement shall terminate. Sections 3, 4, 5, 6 and 8 shall survive
-          the termination of this Agreement.
-
-   8.  Miscellaneous
-
-      a.  Governing Law. This Agreement is governed and interpreted in
-          accordance with the laws of the State of California without giving
-          effect to its conflict of laws provisions. The United Nations
-          Convention on Contracts for the International Sale of Goods is
-          expressly disclaimed and shall not apply. Any claim arising out of
-          or related to this Agreement must be brought exclusively in a
-          federal or state court located in Santa Clara County, California
-          and You consent to the jurisdiction and venue of such courts.
-
-      b.  Waiver and Severability. The failure of either party to require
-          performance by the other party of any provision of this Agreement
-          shall not affect the full right to require such performance at any
-          time thereafter; nor shall the waiver by either party of a breach
-          of any provision of this Agreement be taken or held to be a waiver
-          of the provision itself. Severability. If any provision of this
-          Agreement is unenforceable or invalid under any applicable law or
-          is so held by applicable court decision, such unenforceability or
-          invalidity shall not render this Agreement unenforceable or invalid
-          as a whole, and such provision shall be changed and interpreted so
-          as to best accomplish the objectives of such unenforceable or
-          invalid provision within the limits of applicable law or
-          applicable court decisions.
-
-      c.  Amendment and Modification. This Agreement and any of its terms and
-          provisions may only be amended, modified, supplemented or waived in
-          a writing signed by both parties hereto.
-
-      d.  Compliance with Laws. You shall comply with all applicable laws,
-          rules, and regulations in connection with its activities under this
-          Agreement.
-
-      e.  Entire Agreement. This Agreement completely and exclusively states
-          the agreement between You and Licensor regarding this subject
-          matter.
--- a/Show More
+++ b/Show More