shusky: Initialize for Evolution X 9.x

Signed-off-by: AnierinB <anierin@evolution-x.org>
shusky: extract-files improvements
2024-09-10 14:09:32 -07:00 · 2024-09-10 02:49:50 +03:00 · 2024-09-07 15:44:56 +03:00 · 2024-09-07 15:44:56 +03:00 · 2024-09-07 15:44:56 +03:00 · 2024-09-07 15:44:56 +03:00
189 changed files with 4217 additions and 14604 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2011 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.
+#
+
+# WARNING: Everything listed here will be built on ALL platforms,
+# including x86, the universal, and the SDK.  Modules must be uniquely
+# named (liblights.panda), and must build everywhere, or limit themselves
+# to only building on ARM if they include assembly. Individual makefiles
+# are responsible for having their own logic, for fine-grained control.
+
+LOCAL_PATH := $(call my-dir)
+
+# if some modules are built directly from this directory (not subdirectories),
+# their rules should be written here.
+
+ifneq (,$(filter $(TARGET_DEVICE),ripcurrent husky shiba))
+  include $(call all-makefiles-under,$(LOCAL_PATH))
+endif
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -19,10 +19,12 @@ PRODUCT_MAKEFILES := \
    $(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \
    $(LOCAL_DIR)/factory_ripcurrent.mk \
    $(LOCAL_DIR)/aosp_husky.mk \
+    $(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \
    $(LOCAL_DIR)/aosp_husky_fullmte.mk \
    $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \
    $(LOCAL_DIR)/factory_husky.mk \
    $(LOCAL_DIR)/aosp_shiba.mk \
+    $(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \
    $(LOCAL_DIR)/aosp_shiba_fullmte.mk \
    $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \
    $(LOCAL_DIR)/factory_shiba.mk \
--- a/BoardConfigEvolution.mk
+++ b/BoardConfigEvolution.mk
@@ -1,4 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -1,11 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #
-
-# Kernel modules
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_kernel_boot
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_kernel_boot))
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)
-BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW)))
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
 per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com

 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk,*/BoardConfig.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
+per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
--- a/aosp_husky.mk
+++ b/aosp_husky.mk
@@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
 BOARD_USES_SWIFTSHADER := true

 $(call inherit-product, device/google/zuma/aosp_common.mk)
-$(call inherit-product, device/google/shusky/husky_generic.mk)
+$(call inherit-product, device/google/shusky/device-husky.mk)

 PRODUCT_NAME := aosp_husky
 PRODUCT_DEVICE := husky
--- a/aosp_husky_61_pgagnostic.mk
+++ b/aosp_husky_61_pgagnostic.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2024 The Android Open-Source Project
+# Copyright 2023 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+$(call inherit-product, device/google/pixel_61/aosp_husky_61.mk)

-$(call inherit-product, device/google/shusky/device-shiba.mk)
+PRODUCT_NAME := aosp_husky_61_pgagnostic
+PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF

-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common
+PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
--- a/aosp_husky_pgagnostic.mk
+++ b/aosp_husky_pgagnostic.mk
@@ -16,11 +16,7 @@
 $(call inherit-product, device/google/shusky/aosp_husky.mk)

 PRODUCT_NAME := aosp_husky_pgagnostic
-PRODUCT_MODEL := AOSP page-size agnostic Husky 16KB ELF
+PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF

 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
-
-TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_RW_FILE_SYSTEM_TYPE := ext4
-TARGET_BOOTS_16K := true
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
--- a/aosp_ripcurrent.mk
+++ b/aosp_ripcurrent.mk
@@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
 BOARD_USES_SWIFTSHADER := true

 $(call inherit-product, device/google/zuma/aosp_common.mk)
-$(call inherit-product, device/google/shusky/ripcurrent_generic.mk)
+$(call inherit-product, device/google/shusky/device-ripcurrent.mk)

 PRODUCT_NAME := aosp_ripcurrent
 PRODUCT_DEVICE := ripcurrent
--- a/aosp_shiba.mk
+++ b/aosp_shiba.mk
@@ -20,7 +20,7 @@ USE_SWIFTSHADER := true
 BOARD_USES_SWIFTSHADER := true

 $(call inherit-product, device/google/zuma/aosp_common.mk)
-$(call inherit-product, device/google/shusky/shiba_generic.mk)
+$(call inherit-product, device/google/shusky/device-shiba.mk)

 PRODUCT_NAME := aosp_shiba
 PRODUCT_DEVICE := shiba
--- a/aosp_shiba_61_pgagnostic.mk
+++ b/aosp_shiba_61_pgagnostic.mk
@@ -1,5 +1,5 @@
 #
-# Copyright 2024 The Android Open-Source Project
+# Copyright 2023 The Android Open-Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,8 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+$(call inherit-product, device/google/pixel_61/aosp_shiba_61.mk)

-$(call inherit-product, device/google/shusky/device-husky.mk)
+PRODUCT_NAME := aosp_shiba_61_pgagnostic
+PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF

-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common
+PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
--- a/aosp_shiba_pgagnostic.mk
+++ b/aosp_shiba_pgagnostic.mk
@@ -16,11 +16,7 @@
 $(call inherit-product, device/google/shusky/aosp_shiba.mk)

 PRODUCT_NAME := aosp_shiba_pgagnostic
-PRODUCT_MODEL := AOSP page-size agnostic Shiba 16KB ELF
+PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF

 PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 16384
-
-TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_RW_FILE_SYSTEM_TYPE := ext4
-TARGET_BOOTS_16K := true
+PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536
--- a/audio/husky/aidl_config/audio_platform_configuration.xml
+++ b/audio/husky/aidl_config/audio_platform_configuration.xml
@@ -24,13 +24,10 @@
      <argument name="PollWaitMs" value="20000" />
      <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
      <argument name="ThermistorType" value="UNKNOWN" />
-      <argument name="ThrottlingSeverity" value="LIGHT" />
+      <argument name="ThrottlingSeverity" value="MODERATE" />
    </feature>
    <feature name="RuntimeTuningDump" />
-    <feature name="SoundDose">
-      <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
-    </feature>
-    <feature name="spatializer-offload" />
+    <!-- <feature name="spatializer-offload" /> -->
  </features>

  <voipVolume>
@@ -50,6 +47,7 @@
    <device name="usb" />
    <device name="speaker" codec="cs35l41">
      <argument name="SpeakerNum" value="2" />
+      <argument name="Rotation" />
      <argument name="AcousticShockProtection" />
    </device>
  </devices>
@@ -60,12 +58,11 @@
      <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
    </tuner>
    <tuner type="telephony" name="fortemedia">
-      <argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
+      <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
      <argument name="VoIP_Rate" value="32000" />
      <argument name="BOOST_USB_SWB_CLK" value="y" />
      <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
      <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
-      <argument name="MCPS_TABLE" value="y" />
    </tuner>
    <tuner type="capture" name="gs_capture" />
  </tuners>
@@ -74,8 +71,8 @@
    <latency source="primary-playback" sink="speaker" milliseconds="20" />
    <latency source="primary-playback" sink="usb-device" milliseconds="10" />
    <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />

    <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
    <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -92,227 +89,21 @@
    <latency source="microphones" sink="primary-capture" milliseconds="160" />
    <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
-    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
-    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
  </latencies>

  <spatialCapture>
    <enablement useCase="primary-capture" deviceInterface="microphones">
      <source>MIC</source>
      <source>CAMCORDER</source>
+      <source>VOICE_RECOGNITION</source>
    </enablement>
    <enablement useCase="primary-capture" deviceInterface="back-microphones">
      <source>MIC</source>
      <source>CAMCORDER</source>
+      <source>VOICE_RECOGNITION</source>
    </enablement>
  </spatialCapture>

-  <microphones>
-    <microphone id="builtin_mic_1" location="MAINBODY" group="0" indexInTheGroup="0"
-      directionality="OMNI">
-      <device type="IN_MICROPHONE" address="bottom" />
-      <sensitivity levelDbfs="37.0" maxSplDb="132.5" minSplDb="28.5" />
-      <position x="0.0269" y="0.0058" z="0.0079" />
-      <orientation x="0.0" y="0.0" z="1.0" />
-      <frequencyResponse>
-        <point frequencyHz="100.00" levelDb="-0.78" />
-        <point frequencyHz="106.00" levelDb="-0.71" />
-        <point frequencyHz="112.00" levelDb="-0.64" />
-        <point frequencyHz="118.00" levelDb="-0.60" />
-        <point frequencyHz="125.00" levelDb="-0.55" />
-        <point frequencyHz="132.00" levelDb="-0.50" />
-        <point frequencyHz="140.00" levelDb="-0.47" />
-        <point frequencyHz="150.00" levelDb="-0.42" />
-        <point frequencyHz="160.00" levelDb="-0.39" />
-        <point frequencyHz="170.00" levelDb="-0.36" />
-        <point frequencyHz="180.00" levelDb="-0.34" />
-        <point frequencyHz="190.00" levelDb="-0.33" />
-        <point frequencyHz="200.00" levelDb="-0.32" />
-        <point frequencyHz="212.00" levelDb="-0.29" />
-        <point frequencyHz="224.00" levelDb="-0.28" />
-        <point frequencyHz="236.00" levelDb="-0.28" />
-        <point frequencyHz="250.00" levelDb="-0.27" />
-        <point frequencyHz="265.00" levelDb="-0.25" />
-        <point frequencyHz="280.00" levelDb="-0.25" />
-        <point frequencyHz="300.00" levelDb="-0.24" />
-        <point frequencyHz="315.00" levelDb="-0.23" />
-        <point frequencyHz="335.00" levelDb="-0.23" />
-        <point frequencyHz="355.00" levelDb="-0.22" />
-        <point frequencyHz="375.00" levelDb="-0.22" />
-        <point frequencyHz="400.00" levelDb="-0.19" />
-        <point frequencyHz="425.00" levelDb="-0.17" />
-        <point frequencyHz="450.00" levelDb="-0.15" />
-        <point frequencyHz="475.00" levelDb="-0.15" />
-        <point frequencyHz="500.00" levelDb="-0.14" />
-        <point frequencyHz="530.00" levelDb="-0.14" />
-        <point frequencyHz="560.00" levelDb="-0.12" />
-        <point frequencyHz="600.00" levelDb="-0.11" />
-        <point frequencyHz="630.00" levelDb="-0.10" />
-        <point frequencyHz="670.00" levelDb="-0.10" />
-        <point frequencyHz="710.00" levelDb="-0.08" />
-        <point frequencyHz="750.00" levelDb="-0.07" />
-        <point frequencyHz="800.00" levelDb="-0.07" />
-        <point frequencyHz="850.00" levelDb="-0.04" />
-        <point frequencyHz="900.00" levelDb="-0.03" />
-        <point frequencyHz="950.00" levelDb="-0.01" />
-        <point frequencyHz="1000.00" levelDb="0.00" />
-        <point frequencyHz="1060.00" levelDb="0.04" />
-        <point frequencyHz="1120.00" levelDb="0.06" />
-        <point frequencyHz="1180.00" levelDb="0.07" />
-        <point frequencyHz="1250.00" levelDb="0.08" />
-        <point frequencyHz="1320.00" levelDb="0.13" />
-        <point frequencyHz="1400.00" levelDb="0.09" />
-        <point frequencyHz="1500.00" levelDb="0.14" />
-        <point frequencyHz="1600.00" levelDb="0.19" />
-        <point frequencyHz="1700.00" levelDb="0.23" />
-        <point frequencyHz="1800.00" levelDb="0.28" />
-        <point frequencyHz="1900.00" levelDb="0.29" />
-        <point frequencyHz="2000.00" levelDb="0.31" />
-        <point frequencyHz="2120.00" levelDb="0.37" />
-        <point frequencyHz="2240.00" levelDb="0.88" />
-        <point frequencyHz="2360.00" levelDb="0.86" />
-        <point frequencyHz="2500.00" levelDb="0.77" />
-        <point frequencyHz="2650.00" levelDb="0.78" />
-        <point frequencyHz="2800.00" levelDb="0.84" />
-        <point frequencyHz="3000.00" levelDb="0.86" />
-        <point frequencyHz="3150.00" levelDb="1.05" />
-        <point frequencyHz="3350.00" levelDb="1.12" />
-        <point frequencyHz="3550.00" levelDb="1.18" />
-        <point frequencyHz="3750.00" levelDb="1.25" />
-        <point frequencyHz="4000.00" levelDb="1.43" />
-        <point frequencyHz="4250.00" levelDb="1.66" />
-        <point frequencyHz="4500.00" levelDb="1.83" />
-        <point frequencyHz="4750.00" levelDb="2.02" />
-        <point frequencyHz="5000.00" levelDb="2.23" />
-        <point frequencyHz="5300.00" levelDb="2.59" />
-        <point frequencyHz="5600.00" levelDb="2.84" />
-        <point frequencyHz="6000.00" levelDb="3.35" />
-        <point frequencyHz="6300.00" levelDb="4.01" />
-        <point frequencyHz="6700.00" levelDb="6.82" />
-        <point frequencyHz="7100.00" levelDb="6.62" />
-        <point frequencyHz="7500.00" levelDb="6.42" />
-        <point frequencyHz="8000.00" levelDb="7.30" />
-        <point frequencyHz="8500.00" levelDb="8.23" />
-        <point frequencyHz="9000.00" levelDb="7.54" />
-        <point frequencyHz="9500.00" levelDb="12.68" />
-        <point frequencyHz="10000.00" levelDb="13.76" />
-        <point frequencyHz="10600.00" levelDb="18.69" />
-        <point frequencyHz="11200.00" levelDb="19.68" />
-        <point frequencyHz="11800.00" levelDb="20.90" />
-        <point frequencyHz="12500.00" levelDb="23.70" />
-        <point frequencyHz="13200.00" levelDb="25.10" />
-        <point frequencyHz="14000.00" levelDb="21.65" />
-        <point frequencyHz="15000.00" levelDb="16.18" />
-        <point frequencyHz="16000.00" levelDb="18.84" />
-        <point frequencyHz="17000.00" levelDb="25.44" />
-        <point frequencyHz="18000.00" levelDb="23.48" />
-        <point frequencyHz="19000.00" levelDb="23.22" />
-        <point frequencyHz="20000.00" levelDb="24.89" />
-      </frequencyResponse>
-    </microphone>
-    <microphone id="builtin_mic_2" location="MAINBODY" group="0" indexInTheGroup="1"
-      directionality="OMNI">
-      <device type="IN_MICROPHONE_BACK" address="back" />
-      <sensitivity levelDbfs="-37.0" maxSplDb="132.5" minSplDb="28.5" />
-      <position x="0.0546" y="0.1456" z="0.00415" />
-      <orientation x="0.0" y="1.0" z="0.0" />
-      <frequencyResponse>
-        <point frequencyHz="106.00" levelDb="-0.75" />
-        <point frequencyHz="112.00" levelDb="-0.74" />
-        <point frequencyHz="118.00" levelDb="-0.69" />
-        <point frequencyHz="125.00" levelDb="-0.65" />
-        <point frequencyHz="132.00" levelDb="-0.62" />
-        <point frequencyHz="140.00" levelDb="-0.61" />
-        <point frequencyHz="150.00" levelDb="-0.56" />
-        <point frequencyHz="160.00" levelDb="-0.53" />
-        <point frequencyHz="170.00" levelDb="-0.50" />
-        <point frequencyHz="180.00" levelDb="-0.47" />
-        <point frequencyHz="190.00" levelDb="-0.43" />
-        <point frequencyHz="200.00" levelDb="-0.40" />
-        <point frequencyHz="212.00" levelDb="-0.37" />
-        <point frequencyHz="224.00" levelDb="-0.36" />
-        <point frequencyHz="236.00" levelDb="-0.33" />
-        <point frequencyHz="250.00" levelDb="-0.30" />
-        <point frequencyHz="265.00" levelDb="-0.28" />
-        <point frequencyHz="280.00" levelDb="-0.25" />
-        <point frequencyHz="300.00" levelDb="-0.24" />
-        <point frequencyHz="315.00" levelDb="-0.24" />
-        <point frequencyHz="335.00" levelDb="-0.24" />
-        <point frequencyHz="355.00" levelDb="-0.25" />
-        <point frequencyHz="375.00" levelDb="-0.24" />
-        <point frequencyHz="400.00" levelDb="-0.12" />
-        <point frequencyHz="425.00" levelDb="-0.10" />
-        <point frequencyHz="450.00" levelDb="-0.08" />
-        <point frequencyHz="475.00" levelDb="-0.09" />
-        <point frequencyHz="500.00" levelDb="-0.07" />
-        <point frequencyHz="530.00" levelDb="-0.07" />
-        <point frequencyHz="560.00" levelDb="-0.06" />
-        <point frequencyHz="600.00" levelDb="-0.06" />
-        <point frequencyHz="630.00" levelDb="-0.06" />
-        <point frequencyHz="670.00" levelDb="-0.05" />
-        <point frequencyHz="710.00" levelDb="-0.04" />
-        <point frequencyHz="750.00" levelDb="-0.05" />
-        <point frequencyHz="800.00" levelDb="-0.04" />
-        <point frequencyHz="850.00" levelDb="-0.01" />
-        <point frequencyHz="900.00" levelDb="0.02" />
-        <point frequencyHz="950.00" levelDb="0.02" />
-        <point frequencyHz="1000.00" levelDb="0.00" />
-        <point frequencyHz="1060.00" levelDb="0.02" />
-        <point frequencyHz="1120.00" levelDb="0.03" />
-        <point frequencyHz="1180.00" levelDb="0.07" />
-        <point frequencyHz="1250.00" levelDb="0.10" />
-        <point frequencyHz="1320.00" levelDb="0.10" />
-        <point frequencyHz="1400.00" levelDb="0.13" />
-        <point frequencyHz="1500.00" levelDb="0.01" />
-        <point frequencyHz="1600.00" levelDb="0.01" />
-        <point frequencyHz="1700.00" levelDb="0.10" />
-        <point frequencyHz="1800.00" levelDb="0.11" />
-        <point frequencyHz="1900.00" levelDb="0.19" />
-        <point frequencyHz="2000.00" levelDb="0.24" />
-        <point frequencyHz="2120.00" levelDb="0.38" />
-        <point frequencyHz="2240.00" levelDb="0.46" />
-        <point frequencyHz="2360.00" levelDb="0.26" />
-        <point frequencyHz="2500.00" levelDb="0.27" />
-        <point frequencyHz="2650.00" levelDb="0.43" />
-        <point frequencyHz="2800.00" levelDb="0.76" />
-        <point frequencyHz="3000.00" levelDb="0.75" />
-        <point frequencyHz="3150.00" levelDb="1.09" />
-        <point frequencyHz="3350.00" levelDb="1.09" />
-        <point frequencyHz="3550.00" levelDb="0.94" />
-        <point frequencyHz="3750.00" levelDb="1.06" />
-        <point frequencyHz="4000.00" levelDb="1.21" />
-        <point frequencyHz="4250.00" levelDb="1.47" />
-        <point frequencyHz="4500.00" levelDb="1.45" />
-        <point frequencyHz="4750.00" levelDb="1.36" />
-        <point frequencyHz="5000.00" levelDb="2.07" />
-        <point frequencyHz="5300.00" levelDb="2.85" />
-        <point frequencyHz="5600.00" levelDb="2.90" />
-        <point frequencyHz="6000.00" levelDb="3.85" />
-        <point frequencyHz="6300.00" levelDb="4.65" />
-        <point frequencyHz="6700.00" levelDb="5.84" />
-        <point frequencyHz="7100.00" levelDb="5.46" />
-        <point frequencyHz="7500.00" levelDb="6.15" />
-        <point frequencyHz="8000.00" levelDb="7.50" />
-        <point frequencyHz="8500.00" levelDb="8.30" />
-        <point frequencyHz="9000.00" levelDb="10.62" />
-        <point frequencyHz="9500.00" levelDb="12.70" />
-        <point frequencyHz="10000.00" levelDb="16.65" />
-        <point frequencyHz="10600.00" levelDb="20.95" />
-        <point frequencyHz="11200.00" levelDb="25.41" />
-        <point frequencyHz="11800.00" levelDb="26.32" />
-        <point frequencyHz="12500.00" levelDb="20.20" />
-        <point frequencyHz="13200.00" levelDb="16.60" />
-        <point frequencyHz="14000.00" levelDb="11.24" />
-        <point frequencyHz="15000.00" levelDb="7.85" />
-        <point frequencyHz="16000.00" levelDb="7.62" />
-        <point frequencyHz="17000.00" levelDb="20.19" />
-        <point frequencyHz="18000.00" levelDb="7.32" />
-        <point frequencyHz="19000.00" levelDb="2.87" />
-        <point frequencyHz="20000.00" levelDb="5.18" />
-      </frequencyResponse>
-    </microphone>
-  </microphones>
-
  <xi:include href="audio_policy_volumes.xml" />
  <xi:include href="default_volume_tables.xml" />
 </audioPlatformConfiguration>
--- a/audio/husky/aidl_config/mixer_paths_aidl.xml
+++ b/audio/husky/aidl_config/mixer_paths_aidl.xml
@@ -233,7 +233,6 @@
  <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 -->
@@ -257,14 +256,10 @@

  <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" />
  <ctl name="Hotword Tap Enable" value="0" />

-  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
-  <!-- crashing since speicifc order is needed between dsp mode and"        -->
-  <!-- spatial module."                                                     -->
-  <ctl name="Mic Spatial Module 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" />
@@ -312,7 +307,6 @@
  <ctl name="Incall Capture Stream0" value="Off" />
  <ctl name="Incall Capture Stream1" value="Off" />
  <ctl name="Incall Capture Stream2" value="Off" />
-  <ctl name="Incall Capture Stream3" value="Off" />

  <!-- These two controls control the muting function of mics and sinks during the voice call. -->
  <!-- They would be enabled by HAL. -->
@@ -419,10 +413,6 @@
    <path name="primary-playback -> bt" />
  </path>

-  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="primary-playback -> bt" />
-  </path>
-
  <path name="primary-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP2" value="1" />
  </path>
@@ -495,10 +485,6 @@
    <path name="raw-playback -> bt" />
  </path>

-  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="raw-playback -> bt" />
-  </path>
-
  <path name="raw-playback-0 -> usb">
    <ctl name="USB_RX Mixer RAW" value="1" />
  </path>
@@ -571,10 +557,6 @@
    <path name="deep-buffer-playback -> bt" />
  </path>

-  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="deep-buffer-playback -> bt" />
-  </path>
-
  <path name="deep-buffer-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP6" value="1" />
  </path>
@@ -652,10 +634,6 @@
    <path name="compress-offload-playback -> bt" />
  </path>

-  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="compress-offload-playback -> bt" />
-  </path>
-
  <path name="compress-offload-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP7" value="1" />
  </path>
@@ -728,10 +706,6 @@
    <path name="mmap-playback -> bt" />
  </path>

-  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="mmap-playback -> bt" />
-  </path>
-
  <path name="mmap-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP1" value="1" />
  </path>
@@ -816,10 +790,6 @@
    <path name="voip-playback -> bt" />
  </path>

-  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="voip-playback -> bt" />
-  </path>
-
  <path name="voip-playback-0 -> usb">
    <ctl name="USB_RX Mixer VOIP" value="1" />
  </path>
@@ -836,6 +806,61 @@
    <path name="voip-playback-0 -> usb" />
  </path>

+  <path name="immersive-playback -> speaker">
+    <ctl name="TDM_0_RX Mixer IMSV" value="1" />
+  </path>
+
+  <path name="immersive-playback-0 -> speaker">
+    <path name="immersive-playback -> speaker" />
+  </path>
+
+  <path name="immersive-playback-0 -> speaker-earpiece">
+    <path name="immersive-playback -> speaker" />
+  </path>
+
+  <path name="immersive-playback-0 -> speaker-safe">
+    <path name="immersive-playback -> speaker" />
+  </path>
+
+  <path name="immersive-playback -> bt">
+    <ctl name="BT_RX Mixer IMSV" value="1" />
+  </path>
+
+  <path name="immersive-playback-0 -> bt">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-low-energy-headset">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb">
+    <ctl name="USB_RX Mixer IMSV" value="1" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb-headset">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb-device">
+    <path name="immersive-playback-0 -> usb" />
+  </path>

  <path name="spatializer-offload-playback -> speaker">
    <ctl name="TDM_0_RX Mixer EP4" value="1" />
@@ -857,18 +882,6 @@
    <ctl name="BT_RX Mixer EP4" value="1" />
  </path>

-  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
-    <path name="spatializer-offload-playback -> bt" />
-  </path>
-
-  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
-    <path name="spatializer-offload-playback -> bt" />
-  </path>
-
-  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
-    <path name="spatializer-offload-playback -> bt" />
-  </path>
-
  <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
    <path name="spatializer-offload-playback -> bt" />
  </path>
@@ -889,10 +902,6 @@
    <path name="spatializer-offload-playback -> bt" />
  </path>

-  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="spatializer-offload-playback -> bt" />
-  </path>
-
  <path name="spatializer-offload-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP4" value="1" />
  </path>
@@ -963,10 +972,6 @@
    <path name="haptic-playback -> bt" />
  </path>

-  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="haptic-playback -> bt" />
-  </path>
-
  <path name="haptic-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP3" value="1" />
    <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1041,39 +1046,6 @@
    <ctl name="VOIP TX Mixer BT_TX" value="1" />
  </path>

-  <path name="microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="back-microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="usb-microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="usb-headset-microphones -> voip-gsenet-capture-0">
-    <path name="usb-microphones -> voip-gsenet-capture-0" />
-  </path>
-
-  <path name="usb-device-microphones -> voip-gsenet-capture-0">
-    <path name="usb-microphones -> voip-gsenet-capture-0" />
-  </path>
-
-  <path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer BT_TX" value="1" />
-  </path>
-
  <path name="microphones -> fast-capture-0">
    <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
  </path>
@@ -1102,47 +1074,11 @@
    <ctl name="EP3 TX Mixer BT_TX" value="1" />
  </path>

-  <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
+  <path name="microphones -> sound-trigger-capture-0" />

-  <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
-    <ctl name="Hotword Tap Enable" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
+  <path name="microphones -> sound-trigger-tap-capture-0" />

-  <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
-
-  <path name="ultrasound-microphones -> ultrasound-capture-0">
-    <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
-  </path>
-
-  <path name="microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="back-microphones -> mmap-capture-0">
-    <path name="microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="usb-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="usb-headset-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="usb-device-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
+  <path name="microphones -> hotword-lookback-capture-0" />

  <!-- voice-call dynamic route -->
  <path name="voice-call-downlink-0 -> speaker">
@@ -1177,10 +1113,6 @@
    <path name="voice-call-downlink-0 -> bt" />
  </path>

-  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
-    <path name="voice-call-downlink-0 -> bt" />
-  </path>
-
  <path name="voice-call-downlink-0 -> usb">
    <ctl name="USB_RX Mixer EP5" value="1" />
  </path>
@@ -1233,9 +1165,77 @@
    <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
  </path>

-  <path name="in-call-capture-source-0 -> in-call-capture-0" />
-  <path name="in-call-capture-source-1 -> in-call-capture-1" />
-  <path name="in-call-capture-source-2 -> in-call-capture-2" />
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="UL_DL" />
+  </path>
+
+  <path name="telephony-rx (MIC) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="UL_DL" />
+  </path>
+
+  <path name="telephony-rx (MIC) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="UL_DL" />
+  </path>
+
+  <path name="telephony-rx (MIC) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>

  <!-- codec setting -->
  <!-- Rx device -->
@@ -1249,6 +1249,7 @@
    <ctl name="PCM Source" value="ASP" />
    <ctl name="AMP PCM Gain" value="7" />
    <ctl name="Main AMP Enable Switch" value="1" />
+    <ctl name="AoC Chirp Enable" value="1" />
  </path>

  <path name="speaker">
@@ -1265,6 +1266,7 @@
    <ctl name="R ASPTX1 Slot Position" value="0" />
    <ctl name="R Main AMP Enable Switch" value="1" />
    <ctl name="Main AMP Enable Switch" value="1" />
+    <!-- load Enable FIR -->
    <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" />
@@ -1273,35 +1275,36 @@

  <path name="speaker-safe">
    <ctl name="R Main AMP Enable Switch" value="1" />
+    <!-- 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>

  <!-- Tx device -->
-  <path name="builtin-mic-id-capture-list">
+  <path name="microphones">
    <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="1" value="3" />
    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-  </path>
-
-  <path name="microphones">
-    <path name="builtin-mic-id-capture-list" />
    <ctl name="MIC DC Blocker" value="1" />
    <ctl name="MIC Record Soft Gain (dB)" value="22" />
  </path>

  <path name="microphones (VOICE)">
-    <path name="builtin-mic-id-capture-list" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
    <ctl name="MIC DC Blocker" value="1" />
    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

-  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
-    <path name="microphones (VOICE)" />
-  </path>
-
  <path name="microphones (VOICE_RECOGNITION)">
-    <path name="builtin-mic-id-capture-list" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
    <ctl name="MIC DC Blocker" value="1" />
    <ctl name="MIC Record Soft Gain (dB)" value="22" />
  </path>
@@ -1313,47 +1316,91 @@
  </path>

  <path name="microphones (SOUND_TRIGGER_AEC)">
-    <path name="builtin-mic-id-capture-list" />
-    <ctl name="MIC DC Blocker" value="1" />
    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
    <ctl name="Audio Capture Mic Source" value="ERASER" />
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

-  <path name="microphones (CAMCORDER)">
-    <path name="builtin-mic-id-capture-list" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
-  <path name="microphones (UNPROCESSED)">
-    <path name="builtin-mic-id-capture-list" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="5" />
-  </path>
-
  <path name="back-microphones">
-    <path name="microphones" />
+    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="22" />
  </path>

  <path name="back-microphones (VOICE)">
-    <path name="microphones (VOICE)" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

-  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
-    <path name="back-microphones (VOICE)" />
+  <path name="microphones (CAMCORDER)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

  <path name="back-microphones (CAMCORDER)">
    <path name="microphones (CAMCORDER)" />
  </path>

-  <path name="back-microphones (UNPROCESSED)">
-    <path name="microphones (UNPROCESSED)" />
+  <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="5" />
  </path>

  <path name="bluetooth-sco-headset-microphones">
-    <path name="builtin-mic-id-capture-list" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
    <ctl name="Audio Capture Mic Source" value="BT_MIC" />
    <ctl name="Voice Call Mic Source" value="BT_MIC" />
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
@@ -1363,70 +1410,16 @@
    <path name="bluetooth-sco-headset-microphones" />
  </path>

-  <path name="usb-microphones">
-    <path name="builtin-mic-id-capture-list" />
+  <path name="usb-headset-microphones">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
    <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" />
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

-  <path name="usb-headset-microphones">
-    <path name="usb-microphones" />
-  </path>
-
-  <path name="usb-device-microphones">
-    <path name="usb-microphones" />
-  </path>
-
-  <path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="in-call-capture-source-0 (VOICE_UPLINK)">
-    <ctl name="Incall Capture Stream0" value="UL" />
-  </path>
-
-  <path name="in-call-capture-source-0 (VOICE_CALL)">
-    <ctl name="Incall Capture Stream0" value="UL_DL" />
-  </path>
-
-  <path name="in-call-capture-source-0">
-    <path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
-  </path>
-
-  <path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="in-call-capture-source-1 (VOICE_UPLINK)">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="in-call-capture-source-1 (VOICE_CALL)">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="in-call-capture-source-1">
-    <path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
-  </path>
-
-  <path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="in-call-capture-source-2 (VOICE_UPLINK)">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="in-call-capture-source-2 (VOICE_CALL)">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="in-call-capture-source-2">
-    <path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
-  </path>
-
  <!-- cs35l41 specific path to load firmware in cs35l41.c -->
  <path name="cs35l41-load-protection-firmware-start">
    <!-- Enable it after get the protection firmware -->
--- a/audio/husky/audio-tables.mk
+++ b/audio/husky/audio-tables.mk
@@ -82,13 +82,3 @@ PRODUCT_COPY_FILES += \
    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps

 endif
-
-ifeq ($(USE_AUDIO_HAL_AIDL),true)
-# Offload spatializer config
-PRODUCT_COPY_FILES += \
-    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
-    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
-    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
-    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
-
-endif
--- a/audio/husky/config/audio_platform_configuration.xml
+++ b/audio/husky/config/audio_platform_configuration.xml
@@ -173,14 +173,14 @@
    </input_backend_cfg_mic_mapping>

    <usecase_attr>
-	    <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 40 periods * 48 frames/period * 2ch * 4(s32) = 15360 bytes -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="false" period="48" period_num="40"/>
+        <!-- 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, 2 * 40ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
+        <!-- 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 -->
@@ -308,7 +308,7 @@
        <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"/>
        <module libname="audio_fortemedia_aoc.so" argu="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" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
+        <module libname="audio_sounddose_aoc.so"/>
        <module libname="liboffloadeffect.so"/>
        <module libname="audio_amcs_ext.so"/>
        <module libname="audio_bluenote_aoc.so"/>
--- a/audio/husky/config/audio_policy_configuration.xml
+++ b/audio/husky/config/audio_policy_configuration.xml
@@ -51,8 +51,8 @@
                             samplingRates="8000 16000 24000 32000 44100 48000"
                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             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"
@@ -138,6 +138,10 @@
                </devicePort>
                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" 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">
@@ -157,6 +161,8 @@
                </devicePort>
                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" 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"
--- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -51,8 +51,8 @@
                             samplingRates="8000 16000 24000 32000 44100 48000"
                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             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"
@@ -138,6 +138,10 @@
                </devicePort>
                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" 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">
@@ -157,6 +161,8 @@
                </devicePort>
                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" 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">
--- a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -131,6 +131,10 @@
                </devicePort>
                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" 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">
@@ -150,6 +154,8 @@
                </devicePort>
                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" 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">
--- a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
@@ -51,8 +51,8 @@
                             samplingRates="8000 16000 24000 32000 44100 48000"
                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             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"
@@ -138,6 +138,10 @@
                </devicePort>
                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" 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">
@@ -157,6 +161,8 @@
                </devicePort>
                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" 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"
--- a/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/husky/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,7 +11,6 @@
                     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"
@@ -52,7 +51,6 @@
        <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"
@@ -68,8 +66,6 @@
        <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"/>
+               sources="le audio output"/>
    </routes>
 </module>
--- a/audio/husky/tuning/spatializer/base
+++ b/audio/husky/tuning/spatializer/base
--- a/audio/husky/tuning/spatializer/mode_2_ch
+++ b/audio/husky/tuning/spatializer/mode_2_ch
--- a/audio/husky/tuning/spatializer/mode_6_ch
+++ b/audio/husky/tuning/spatializer/mode_6_ch
--- a/audio/husky/tuning/spatializer/mode_xaural
+++ b/audio/husky/tuning/spatializer/mode_xaural
--- a/audio/ripcurrent/config/audio_platform_configuration.xml
+++ b/audio/ripcurrent/config/audio_platform_configuration.xml
@@ -179,8 +179,8 @@
        <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, 2 * 40ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
+        <!-- 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 -->
--- a/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/ripcurrent/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,7 +11,6 @@
                     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"
@@ -52,7 +51,6 @@
        <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"
@@ -68,8 +66,6 @@
        <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"/>
+               sources="le audio output"/>
    </routes>
 </module>
--- a/audio/shiba/aidl_config/audio_platform_configuration.xml
+++ b/audio/shiba/aidl_config/audio_platform_configuration.xml
@@ -24,13 +24,10 @@
      <argument name="PollWaitMs" value="20000" />
      <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
      <argument name="ThermistorType" value="UNKNOWN" />
-      <argument name="ThrottlingSeverity" value="LIGHT" />
+      <argument name="ThrottlingSeverity" value="MODERATE" />
    </feature>
    <feature name="RuntimeTuningDump" />
-    <feature name="SoundDose">
-      <argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
-    </feature>
-    <feature name="spatializer-offload" />
+    <!-- <feature name="spatializer-offload" /> -->
  </features>

  <voipVolume>
@@ -50,6 +47,7 @@
    <device name="usb" />
    <device name="speaker" codec="cs35l41">
      <argument name="SpeakerNum" value="2" />
+      <argument name="Rotation" />
      <argument name="AcousticShockProtection" />
    </device>
  </devices>
@@ -60,12 +58,11 @@
      <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
    </tuner>
    <tuner type="telephony" name="fortemedia">
-      <argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
+      <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
      <argument name="VoIP_Rate" value="32000" />
      <argument name="BOOST_USB_SWB_CLK" value="y" />
      <argument name="BOOST_HANDSET_SWB_CLK" value="y" />
      <argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
-      <argument name="MCPS_TABLE" value="y" />
    </tuner>
    <tuner type="capture" name="gs_capture" />
  </tuners>
@@ -74,8 +71,8 @@
    <latency source="primary-playback" sink="speaker" milliseconds="20" />
    <latency source="primary-playback" sink="usb-device" milliseconds="10" />
    <latency source="primary-playback" sink="usb-headset" milliseconds="10" />
-    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
-    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
+    <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
+    <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />

    <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
    <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@@ -92,227 +89,21 @@
    <latency source="microphones" sink="primary-capture" milliseconds="160" />
    <latency source="back-microphones" sink="primary-capture" milliseconds="160" />
    <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
-    <latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
-    <latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
  </latencies>

  <spatialCapture>
    <enablement useCase="primary-capture" deviceInterface="microphones">
      <source>MIC</source>
      <source>CAMCORDER</source>
+      <source>VOICE_RECOGNITION</source>
    </enablement>
    <enablement useCase="primary-capture" deviceInterface="back-microphones">
      <source>MIC</source>
      <source>CAMCORDER</source>
+      <source>VOICE_RECOGNITION</source>
    </enablement>
  </spatialCapture>

-  <microphones>
-    <microphone id="builtin_mic_1" location="MAINBODY" group="0" indexInTheGroup="0"
-      directionality="OMNI">
-      <device type="IN_MICROPHONE" address="bottom" />
-      <sensitivity levelDbfs="37.0" maxSplDb="132.5" minSplDb="28.5" />
-      <position x="0.0269" y="0.0058" z="0.0079" />
-      <orientation x="0.0" y="0.0" z="1.0" />
-      <frequencyResponse>
-        <point frequencyHz="100.00" levelDb="-0.78" />
-        <point frequencyHz="106.00" levelDb="-0.71" />
-        <point frequencyHz="112.00" levelDb="-0.64" />
-        <point frequencyHz="118.00" levelDb="-0.60" />
-        <point frequencyHz="125.00" levelDb="-0.55" />
-        <point frequencyHz="132.00" levelDb="-0.50" />
-        <point frequencyHz="140.00" levelDb="-0.47" />
-        <point frequencyHz="150.00" levelDb="-0.42" />
-        <point frequencyHz="160.00" levelDb="-0.39" />
-        <point frequencyHz="170.00" levelDb="-0.36" />
-        <point frequencyHz="180.00" levelDb="-0.34" />
-        <point frequencyHz="190.00" levelDb="-0.33" />
-        <point frequencyHz="200.00" levelDb="-0.32" />
-        <point frequencyHz="212.00" levelDb="-0.29" />
-        <point frequencyHz="224.00" levelDb="-0.28" />
-        <point frequencyHz="236.00" levelDb="-0.28" />
-        <point frequencyHz="250.00" levelDb="-0.27" />
-        <point frequencyHz="265.00" levelDb="-0.25" />
-        <point frequencyHz="280.00" levelDb="-0.25" />
-        <point frequencyHz="300.00" levelDb="-0.24" />
-        <point frequencyHz="315.00" levelDb="-0.23" />
-        <point frequencyHz="335.00" levelDb="-0.23" />
-        <point frequencyHz="355.00" levelDb="-0.22" />
-        <point frequencyHz="375.00" levelDb="-0.22" />
-        <point frequencyHz="400.00" levelDb="-0.19" />
-        <point frequencyHz="425.00" levelDb="-0.17" />
-        <point frequencyHz="450.00" levelDb="-0.15" />
-        <point frequencyHz="475.00" levelDb="-0.15" />
-        <point frequencyHz="500.00" levelDb="-0.14" />
-        <point frequencyHz="530.00" levelDb="-0.14" />
-        <point frequencyHz="560.00" levelDb="-0.12" />
-        <point frequencyHz="600.00" levelDb="-0.11" />
-        <point frequencyHz="630.00" levelDb="-0.10" />
-        <point frequencyHz="670.00" levelDb="-0.10" />
-        <point frequencyHz="710.00" levelDb="-0.08" />
-        <point frequencyHz="750.00" levelDb="-0.07" />
-        <point frequencyHz="800.00" levelDb="-0.07" />
-        <point frequencyHz="850.00" levelDb="-0.04" />
-        <point frequencyHz="900.00" levelDb="-0.03" />
-        <point frequencyHz="950.00" levelDb="-0.01" />
-        <point frequencyHz="1000.00" levelDb="0.00" />
-        <point frequencyHz="1060.00" levelDb="0.04" />
-        <point frequencyHz="1120.00" levelDb="0.06" />
-        <point frequencyHz="1180.00" levelDb="0.07" />
-        <point frequencyHz="1250.00" levelDb="0.08" />
-        <point frequencyHz="1320.00" levelDb="0.13" />
-        <point frequencyHz="1400.00" levelDb="0.09" />
-        <point frequencyHz="1500.00" levelDb="0.14" />
-        <point frequencyHz="1600.00" levelDb="0.19" />
-        <point frequencyHz="1700.00" levelDb="0.23" />
-        <point frequencyHz="1800.00" levelDb="0.28" />
-        <point frequencyHz="1900.00" levelDb="0.29" />
-        <point frequencyHz="2000.00" levelDb="0.31" />
-        <point frequencyHz="2120.00" levelDb="0.37" />
-        <point frequencyHz="2240.00" levelDb="0.88" />
-        <point frequencyHz="2360.00" levelDb="0.86" />
-        <point frequencyHz="2500.00" levelDb="0.77" />
-        <point frequencyHz="2650.00" levelDb="0.78" />
-        <point frequencyHz="2800.00" levelDb="0.84" />
-        <point frequencyHz="3000.00" levelDb="0.86" />
-        <point frequencyHz="3150.00" levelDb="1.05" />
-        <point frequencyHz="3350.00" levelDb="1.12" />
-        <point frequencyHz="3550.00" levelDb="1.18" />
-        <point frequencyHz="3750.00" levelDb="1.25" />
-        <point frequencyHz="4000.00" levelDb="1.43" />
-        <point frequencyHz="4250.00" levelDb="1.66" />
-        <point frequencyHz="4500.00" levelDb="1.83" />
-        <point frequencyHz="4750.00" levelDb="2.02" />
-        <point frequencyHz="5000.00" levelDb="2.23" />
-        <point frequencyHz="5300.00" levelDb="2.59" />
-        <point frequencyHz="5600.00" levelDb="2.84" />
-        <point frequencyHz="6000.00" levelDb="3.35" />
-        <point frequencyHz="6300.00" levelDb="4.01" />
-        <point frequencyHz="6700.00" levelDb="6.82" />
-        <point frequencyHz="7100.00" levelDb="6.62" />
-        <point frequencyHz="7500.00" levelDb="6.42" />
-        <point frequencyHz="8000.00" levelDb="7.30" />
-        <point frequencyHz="8500.00" levelDb="8.23" />
-        <point frequencyHz="9000.00" levelDb="7.54" />
-        <point frequencyHz="9500.00" levelDb="12.68" />
-        <point frequencyHz="10000.00" levelDb="13.76" />
-        <point frequencyHz="10600.00" levelDb="18.69" />
-        <point frequencyHz="11200.00" levelDb="19.68" />
-        <point frequencyHz="11800.00" levelDb="20.90" />
-        <point frequencyHz="12500.00" levelDb="23.70" />
-        <point frequencyHz="13200.00" levelDb="25.10" />
-        <point frequencyHz="14000.00" levelDb="21.65" />
-        <point frequencyHz="15000.00" levelDb="16.18" />
-        <point frequencyHz="16000.00" levelDb="18.84" />
-        <point frequencyHz="17000.00" levelDb="25.44" />
-        <point frequencyHz="18000.00" levelDb="23.48" />
-        <point frequencyHz="19000.00" levelDb="23.22" />
-        <point frequencyHz="20000.00" levelDb="24.89" />
-      </frequencyResponse>
-    </microphone>
-    <microphone id="builtin_mic_2" location="MAINBODY" group="0" indexInTheGroup="1"
-      directionality="OMNI">
-      <device type="IN_MICROPHONE_BACK" address="back" />
-      <sensitivity levelDbfs="-37.0" maxSplDb="132.5" minSplDb="28.5" />
-      <position x="0.0546" y="0.1456" z="0.00415" />
-      <orientation x="0.0" y="1.0" z="0.0" />
-      <frequencyResponse>
-        <point frequencyHz="106.00" levelDb="-0.75" />
-        <point frequencyHz="112.00" levelDb="-0.74" />
-        <point frequencyHz="118.00" levelDb="-0.69" />
-        <point frequencyHz="125.00" levelDb="-0.65" />
-        <point frequencyHz="132.00" levelDb="-0.62" />
-        <point frequencyHz="140.00" levelDb="-0.61" />
-        <point frequencyHz="150.00" levelDb="-0.56" />
-        <point frequencyHz="160.00" levelDb="-0.53" />
-        <point frequencyHz="170.00" levelDb="-0.50" />
-        <point frequencyHz="180.00" levelDb="-0.47" />
-        <point frequencyHz="190.00" levelDb="-0.43" />
-        <point frequencyHz="200.00" levelDb="-0.40" />
-        <point frequencyHz="212.00" levelDb="-0.37" />
-        <point frequencyHz="224.00" levelDb="-0.36" />
-        <point frequencyHz="236.00" levelDb="-0.33" />
-        <point frequencyHz="250.00" levelDb="-0.30" />
-        <point frequencyHz="265.00" levelDb="-0.28" />
-        <point frequencyHz="280.00" levelDb="-0.25" />
-        <point frequencyHz="300.00" levelDb="-0.24" />
-        <point frequencyHz="315.00" levelDb="-0.24" />
-        <point frequencyHz="335.00" levelDb="-0.24" />
-        <point frequencyHz="355.00" levelDb="-0.25" />
-        <point frequencyHz="375.00" levelDb="-0.24" />
-        <point frequencyHz="400.00" levelDb="-0.12" />
-        <point frequencyHz="425.00" levelDb="-0.10" />
-        <point frequencyHz="450.00" levelDb="-0.08" />
-        <point frequencyHz="475.00" levelDb="-0.09" />
-        <point frequencyHz="500.00" levelDb="-0.07" />
-        <point frequencyHz="530.00" levelDb="-0.07" />
-        <point frequencyHz="560.00" levelDb="-0.06" />
-        <point frequencyHz="600.00" levelDb="-0.06" />
-        <point frequencyHz="630.00" levelDb="-0.06" />
-        <point frequencyHz="670.00" levelDb="-0.05" />
-        <point frequencyHz="710.00" levelDb="-0.04" />
-        <point frequencyHz="750.00" levelDb="-0.05" />
-        <point frequencyHz="800.00" levelDb="-0.04" />
-        <point frequencyHz="850.00" levelDb="-0.01" />
-        <point frequencyHz="900.00" levelDb="0.02" />
-        <point frequencyHz="950.00" levelDb="0.02" />
-        <point frequencyHz="1000.00" levelDb="0.00" />
-        <point frequencyHz="1060.00" levelDb="0.02" />
-        <point frequencyHz="1120.00" levelDb="0.03" />
-        <point frequencyHz="1180.00" levelDb="0.07" />
-        <point frequencyHz="1250.00" levelDb="0.10" />
-        <point frequencyHz="1320.00" levelDb="0.10" />
-        <point frequencyHz="1400.00" levelDb="0.13" />
-        <point frequencyHz="1500.00" levelDb="0.01" />
-        <point frequencyHz="1600.00" levelDb="0.01" />
-        <point frequencyHz="1700.00" levelDb="0.10" />
-        <point frequencyHz="1800.00" levelDb="0.11" />
-        <point frequencyHz="1900.00" levelDb="0.19" />
-        <point frequencyHz="2000.00" levelDb="0.24" />
-        <point frequencyHz="2120.00" levelDb="0.38" />
-        <point frequencyHz="2240.00" levelDb="0.46" />
-        <point frequencyHz="2360.00" levelDb="0.26" />
-        <point frequencyHz="2500.00" levelDb="0.27" />
-        <point frequencyHz="2650.00" levelDb="0.43" />
-        <point frequencyHz="2800.00" levelDb="0.76" />
-        <point frequencyHz="3000.00" levelDb="0.75" />
-        <point frequencyHz="3150.00" levelDb="1.09" />
-        <point frequencyHz="3350.00" levelDb="1.09" />
-        <point frequencyHz="3550.00" levelDb="0.94" />
-        <point frequencyHz="3750.00" levelDb="1.06" />
-        <point frequencyHz="4000.00" levelDb="1.21" />
-        <point frequencyHz="4250.00" levelDb="1.47" />
-        <point frequencyHz="4500.00" levelDb="1.45" />
-        <point frequencyHz="4750.00" levelDb="1.36" />
-        <point frequencyHz="5000.00" levelDb="2.07" />
-        <point frequencyHz="5300.00" levelDb="2.85" />
-        <point frequencyHz="5600.00" levelDb="2.90" />
-        <point frequencyHz="6000.00" levelDb="3.85" />
-        <point frequencyHz="6300.00" levelDb="4.65" />
-        <point frequencyHz="6700.00" levelDb="5.84" />
-        <point frequencyHz="7100.00" levelDb="5.46" />
-        <point frequencyHz="7500.00" levelDb="6.15" />
-        <point frequencyHz="8000.00" levelDb="7.50" />
-        <point frequencyHz="8500.00" levelDb="8.30" />
-        <point frequencyHz="9000.00" levelDb="10.62" />
-        <point frequencyHz="9500.00" levelDb="12.70" />
-        <point frequencyHz="10000.00" levelDb="16.65" />
-        <point frequencyHz="10600.00" levelDb="20.95" />
-        <point frequencyHz="11200.00" levelDb="25.41" />
-        <point frequencyHz="11800.00" levelDb="26.32" />
-        <point frequencyHz="12500.00" levelDb="20.20" />
-        <point frequencyHz="13200.00" levelDb="16.60" />
-        <point frequencyHz="14000.00" levelDb="11.24" />
-        <point frequencyHz="15000.00" levelDb="7.85" />
-        <point frequencyHz="16000.00" levelDb="7.62" />
-        <point frequencyHz="17000.00" levelDb="20.19" />
-        <point frequencyHz="18000.00" levelDb="7.32" />
-        <point frequencyHz="19000.00" levelDb="2.87" />
-        <point frequencyHz="20000.00" levelDb="5.18" />
-      </frequencyResponse>
-    </microphone>
-  </microphones>
-
  <xi:include href="audio_policy_volumes.xml" />
  <xi:include href="default_volume_tables.xml" />
 </audioPlatformConfiguration>
--- a/audio/shiba/aidl_config/audio_policy_volumes.xml
+++ b/audio/shiba/aidl_config/audio_policy_volumes.xml
@@ -51,14 +51,8 @@ volume index from 0 to 100.
        <point>66,-2200</point>
        <point>100,-1800</point>
    </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4500</point>
-        <point>29,-3400</point>
-        <point>57,-2250</point>
-        <point>71,-1900</point>
-        <point>86,-1530</point>
-        <point>100,-1100</point>
-    </volume>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -68,12 +62,9 @@ volume index from 0 to 100.
    <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,-4000</point>
-        <point>29,-2950</point>
-        <point>43,-2350</point>
-        <point>57,-1850</point>
-        <point>71,-1400</point>
-        <point>86,-700</point>
+        <point>1,-2970</point>
+        <point>33,-2010</point>
+        <point>66,-1020</point>
        <point>100,0</point>
    </volume>
    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -85,31 +76,31 @@ volume index from 0 to 100.
    <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,-5927</point>
-        <point>4,-5927</point>
-        <point>8,-5574</point>
-        <point>12,-5281</point>
-        <point>16,-4952</point>
-        <point>20,-4562</point>
-        <point>24,-4213</point>
-        <point>28,-3838</point>
-        <point>32,-3600</point>
-        <point>36,-3385</point>
-        <point>40,-3116</point>
-        <point>44,-2927</point>
-        <point>48,-2665</point>
-        <point>52,-2436</point>
-        <point>56,-2181</point>
-        <point>60,-1985</point>
-        <point>64,-1743</point>
-        <point>68,-1553</point>
-        <point>72,-1427</point>
-        <point>76,-1166</point>
-        <point>80,-1045</point>
-        <point>84,-895</point>
-        <point>88,-644</point>
-        <point>92,-486</point>
-        <point>96,-209</point>
+        <point>1,-6438</point>
+        <point>4,-6438</point>
+        <point>8,-5961</point>
+        <point>12,-5543</point>
+        <point>16,-5167</point>
+        <point>20,-4743</point>
+        <point>24,-4391</point>
+        <point>28,-4061</point>
+        <point>32,-3871</point>
+        <point>36,-3673</point>
+        <point>40,-3471</point>
+        <point>44,-3273</point>
+        <point>48,-3065</point>
+        <point>52,-2850</point>
+        <point>56,-2618</point>
+        <point>60,-2355</point>
+        <point>64,-2060</point>
+        <point>68,-1773</point>
+        <point>72,-1482</point>
+        <point>76,-1205</point>
+        <point>80,-989</point>
+        <point>84,-791</point>
+        <point>88,-578</point>
+        <point>92,-374</point>
+        <point>96,-137</point>
        <point>100,0</point>
    </volume>
    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -121,11 +112,9 @@ volume index from 0 to 100.
    <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,-5600</point>
-        <point>29,-3520</point>
-        <point>57,-1500</point>
-        <point>71,-1150</point>
-        <point>86,-500</point>
+        <point>0,-2970</point>
+        <point>33,-2010</point>
+        <point>66,-1020</point>
        <point>100,0</point>
    </volume>
    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -137,11 +126,10 @@ volume index from 0 to 100.
    <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,-4500</point>
-        <point>29,-3800</point>
-        <point>71,-1850</point>
-        <point>86,-1000</point>
-        <point>100,-500</point>
+        <point>1,-2970</point>
+        <point>33,-2010</point>
+        <point>66,-1020</point>
+        <point>100,0</point>
    </volume>
    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                               ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -177,14 +165,8 @@ volume index from 0 to 100.
        <point>66,-2200</point>
        <point>100,-1800</point>
    </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4500</point>
-        <point>29,-3400</point>
-        <point>57,-2250</point>
-        <point>71,-1900</point>
-        <point>86,-1530</point>
-        <point>100,-1100</point>
-    </volume>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
    <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"
@@ -197,14 +179,8 @@ volume index from 0 to 100.
        <point>66,-2200</point>
        <point>100,-1800</point>
    </volume>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5700</point>
-        <point>29,-4230</point>
-        <point>43,-3300</point>
-        <point>57,-3100</point>
-        <point>71,-2500</point>
-        <point>100,-1400</point>
-    </volume>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"
+                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -233,7 +233,6 @@
  <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 -->
@@ -257,14 +256,10 @@

  <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" />
  <ctl name="Hotword Tap Enable" value="0" />

-  <!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc"     -->
-  <!-- crashing since speicifc order is needed between dsp mode and"        -->
-  <!-- spatial module."                                                     -->
-  <ctl name="Mic Spatial Module 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" />
@@ -312,7 +307,6 @@
  <ctl name="Incall Capture Stream0" value="Off" />
  <ctl name="Incall Capture Stream1" value="Off" />
  <ctl name="Incall Capture Stream2" value="Off" />
-  <ctl name="Incall Capture Stream3" value="Off" />

  <!-- These two controls control the muting function of mics and sinks during the voice call. -->
  <!-- They would be enabled by HAL. -->
@@ -419,10 +413,6 @@
    <path name="primary-playback -> bt" />
  </path>

-  <path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="primary-playback -> bt" />
-  </path>
-
  <path name="primary-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP2" value="1" />
  </path>
@@ -495,10 +485,6 @@
    <path name="raw-playback -> bt" />
  </path>

-  <path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="raw-playback -> bt" />
-  </path>
-
  <path name="raw-playback-0 -> usb">
    <ctl name="USB_RX Mixer RAW" value="1" />
  </path>
@@ -571,10 +557,6 @@
    <path name="deep-buffer-playback -> bt" />
  </path>

-  <path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="deep-buffer-playback -> bt" />
-  </path>
-
  <path name="deep-buffer-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP6" value="1" />
  </path>
@@ -652,10 +634,6 @@
    <path name="compress-offload-playback -> bt" />
  </path>

-  <path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="compress-offload-playback -> bt" />
-  </path>
-
  <path name="compress-offload-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP7" value="1" />
  </path>
@@ -728,10 +706,6 @@
    <path name="mmap-playback -> bt" />
  </path>

-  <path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="mmap-playback -> bt" />
-  </path>
-
  <path name="mmap-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP1" value="1" />
  </path>
@@ -816,10 +790,6 @@
    <path name="voip-playback -> bt" />
  </path>

-  <path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="voip-playback -> bt" />
-  </path>
-
  <path name="voip-playback-0 -> usb">
    <ctl name="USB_RX Mixer VOIP" value="1" />
  </path>
@@ -836,6 +806,61 @@
    <path name="voip-playback-0 -> usb" />
  </path>

+  <path name="immersive-playback -> speaker">
+    <ctl name="TDM_0_RX Mixer IMSV" value="1" />
+  </path>
+
+  <path name="immersive-playback-0 -> speaker">
+    <path name="immersive-playback -> speaker" />
+  </path>
+
+  <path name="immersive-playback-0 -> speaker-earpiece">
+    <path name="immersive-playback -> speaker" />
+  </path>
+
+  <path name="immersive-playback-0 -> speaker-safe">
+    <path name="immersive-playback -> speaker" />
+  </path>
+
+  <path name="immersive-playback -> bt">
+    <ctl name="BT_RX Mixer IMSV" value="1" />
+  </path>
+
+  <path name="immersive-playback-0 -> bt">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-device">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-low-energy-headset">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
+    <path name="immersive-playback -> bt" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb">
+    <ctl name="USB_RX Mixer IMSV" value="1" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb-headset">
+    <path name="immersive-playback-0 -> usb" />
+  </path>
+
+  <path name="immersive-playback-0 -> usb-device">
+    <path name="immersive-playback-0 -> usb" />
+  </path>

  <path name="spatializer-offload-playback -> speaker">
    <ctl name="TDM_0_RX Mixer EP4" value="1" />
@@ -857,18 +882,6 @@
    <ctl name="BT_RX Mixer EP4" value="1" />
  </path>

-  <path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
-    <path name="spatializer-offload-playback -> bt" />
-  </path>
-
-  <path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
-    <path name="spatializer-offload-playback -> bt" />
-  </path>
-
-  <path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
-    <path name="spatializer-offload-playback -> bt" />
-  </path>
-
  <path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
    <path name="spatializer-offload-playback -> bt" />
  </path>
@@ -889,10 +902,6 @@
    <path name="spatializer-offload-playback -> bt" />
  </path>

-  <path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="spatializer-offload-playback -> bt" />
-  </path>
-
  <path name="spatializer-offload-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP4" value="1" />
  </path>
@@ -963,10 +972,6 @@
    <path name="haptic-playback -> bt" />
  </path>

-  <path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
-    <path name="haptic-playback -> bt" />
-  </path>
-
  <path name="haptic-playback-0 -> usb">
    <ctl name="USB_RX Mixer EP3" value="1" />
    <ctl name="TDM_0_RX Mixer EP8" value="1" />
@@ -1041,39 +1046,6 @@
    <ctl name="VOIP TX Mixer BT_TX" value="1" />
  </path>

-  <path name="microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="back-microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="usb-microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="usb-headset-microphones -> voip-gsenet-capture-0">
-    <path name="usb-microphones -> voip-gsenet-capture-0" />
-  </path>
-
-  <path name="usb-device-microphones -> voip-gsenet-capture-0">
-    <path name="usb-microphones -> voip-gsenet-capture-0" />
-  </path>
-
-  <path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
-    <ctl name="Incall Capture Stream3" value="3MIC" />
-    <ctl name="VOIP TX Mixer BT_TX" value="1" />
-  </path>
-
  <path name="microphones -> fast-capture-0">
    <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
  </path>
@@ -1102,47 +1074,11 @@
    <ctl name="EP3 TX Mixer BT_TX" value="1" />
  </path>

-  <path name="sound-trigger-microphones -> sound-trigger-capture-0" />
+  <path name="microphones -> sound-trigger-capture-0" />

-  <path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
-    <ctl name="Audio Capture Eraser Enable" value="1" />
-    <ctl name="Hotword Tap Enable" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
+  <path name="microphones -> sound-trigger-tap-capture-0" />

-  <path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
-
-  <path name="ultrasound-microphones -> ultrasound-capture-0">
-    <ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
-  </path>
-
-  <path name="microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
-  </path>
-
-  <path name="back-microphones -> mmap-capture-0">
-    <path name="microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="usb-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer USB_TX" value="1" />
-  </path>
-
-  <path name="usb-headset-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="usb-device-microphones -> mmap-capture-0">
-    <path name="usb-microphones -> mmap-capture-0" />
-  </path>
-
-  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
-
-  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
-    <ctl name="EP2 TX Mixer BT_TX" value="1" />
-  </path>
+  <path name="microphones -> hotword-lookback-capture-0" />

  <!-- voice-call dynamic route -->
  <path name="voice-call-downlink-0 -> speaker">
@@ -1177,10 +1113,6 @@
    <path name="voice-call-downlink-0 -> bt" />
  </path>

-  <path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
-    <path name="voice-call-downlink-0 -> bt" />
-  </path>
-
  <path name="voice-call-downlink-0 -> usb">
    <ctl name="USB_RX Mixer EP5" value="1" />
  </path>
@@ -1233,9 +1165,77 @@
    <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
  </path>

-  <path name="in-call-capture-source-0 -> in-call-capture-0" />
-  <path name="in-call-capture-source-1 -> in-call-capture-1" />
-  <path name="in-call-capture-source-2 -> in-call-capture-2" />
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="UL_DL" />
+  </path>
+
+  <path name="telephony-rx (MIC) -> in-call-capture-0">
+    <ctl name="Incall Capture Stream0" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="UL_DL" />
+  </path>
+
+  <path name="telephony-rx (MIC) -> in-call-capture-1">
+    <ctl name="Incall Capture Stream1" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="UL" />
+  </path>
+
+  <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="UL_DL" />
+  </path>
+
+  <path name="telephony-rx (MIC) -> in-call-capture-2">
+    <ctl name="Incall Capture Stream2" value="DL" />
+  </path>
+
+  <path name="microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
+  </path>
+
+  <path name="usb-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer USB_TX" value="1" />
+  </path>
+
+  <path name="usb-headset-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="usb-device-microphones -> mmap-capture-0">
+    <path name="usb-microphones -> mmap-capture-0" />
+  </path>
+
+  <path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>
+
+  <path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
+    <ctl name="EP2 TX Mixer BT_TX" value="1" />
+  </path>

  <!-- codec setting -->
  <!-- Rx device -->
@@ -1249,6 +1249,7 @@
    <ctl name="PCM Source" value="ASP" />
    <ctl name="AMP PCM Gain" value="7" />
    <ctl name="Main AMP Enable Switch" value="1" />
+    <ctl name="AoC Chirp Enable" value="1" />
  </path>

  <path name="speaker">
@@ -1265,6 +1266,7 @@
    <ctl name="R ASPTX1 Slot Position" value="0" />
    <ctl name="R Main AMP Enable Switch" value="1" />
    <ctl name="Main AMP Enable Switch" value="1" />
+    <!-- load Enable FIR -->
    <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" />
@@ -1273,35 +1275,36 @@

  <path name="speaker-safe">
    <ctl name="R Main AMP Enable Switch" value="1" />
+    <!-- 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>

  <!-- Tx device -->
-  <path name="builtin-mic-id-capture-list">
+  <path name="microphones">
    <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="1" value="3" />
    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
-  </path>
-
-  <path name="microphones">
-    <path name="builtin-mic-id-capture-list" />
    <ctl name="MIC DC Blocker" value="1" />
    <ctl name="MIC Record Soft Gain (dB)" value="22" />
  </path>

  <path name="microphones (VOICE)">
-    <path name="builtin-mic-id-capture-list" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
    <ctl name="MIC DC Blocker" value="1" />
    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

-  <path name="microphones (VOICE_COMMUNICATION,VOICE)">
-    <path name="microphones (VOICE)" />
-  </path>
-
  <path name="microphones (VOICE_RECOGNITION)">
-    <path name="builtin-mic-id-capture-list" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
    <ctl name="MIC DC Blocker" value="1" />
    <ctl name="MIC Record Soft Gain (dB)" value="22" />
  </path>
@@ -1313,47 +1316,91 @@
  </path>

  <path name="microphones (SOUND_TRIGGER_AEC)">
-    <path name="builtin-mic-id-capture-list" />
-    <ctl name="MIC DC Blocker" value="1" />
    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
    <ctl name="Audio Capture Mic Source" value="ERASER" />
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

-  <path name="microphones (CAMCORDER)">
-    <path name="builtin-mic-id-capture-list" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="0" />
-  </path>
-
-  <path name="microphones (UNPROCESSED)">
-    <path name="builtin-mic-id-capture-list" />
-    <ctl name="MIC DC Blocker" value="1" />
-    <ctl name="MIC Record Soft Gain (dB)" value="5" />
-  </path>
-
  <path name="back-microphones">
-    <path name="microphones" />
+    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="22" />
  </path>

  <path name="back-microphones (VOICE)">
-    <path name="microphones (VOICE)" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

-  <path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
-    <path name="back-microphones (VOICE)" />
+  <path name="microphones (CAMCORDER)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

  <path name="back-microphones (CAMCORDER)">
    <path name="microphones (CAMCORDER)" />
  </path>

-  <path name="back-microphones (UNPROCESSED)">
-    <path name="microphones (UNPROCESSED)" />
+  <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <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="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
+    <ctl name="MIC DC Blocker" value="1" />
+    <ctl name="MIC Record Soft Gain (dB)" value="5" />
  </path>

  <path name="bluetooth-sco-headset-microphones">
-    <path name="builtin-mic-id-capture-list" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
    <ctl name="Audio Capture Mic Source" value="BT_MIC" />
    <ctl name="Voice Call Mic Source" value="BT_MIC" />
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
@@ -1363,70 +1410,16 @@
    <path name="bluetooth-sco-headset-microphones" />
  </path>

-  <path name="usb-microphones">
-    <path name="builtin-mic-id-capture-list" />
+  <path name="usb-headset-microphones">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
    <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" />
    <ctl name="MIC Record Soft Gain (dB)" value="0" />
  </path>

-  <path name="usb-headset-microphones">
-    <path name="usb-microphones" />
-  </path>
-
-  <path name="usb-device-microphones">
-    <path name="usb-microphones" />
-  </path>
-
-  <path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
-    <ctl name="Incall Capture Stream0" value="DL" />
-  </path>
-
-  <path name="in-call-capture-source-0 (VOICE_UPLINK)">
-    <ctl name="Incall Capture Stream0" value="UL" />
-  </path>
-
-  <path name="in-call-capture-source-0 (VOICE_CALL)">
-    <ctl name="Incall Capture Stream0" value="UL_DL" />
-  </path>
-
-  <path name="in-call-capture-source-0">
-    <path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
-  </path>
-
-  <path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
-    <ctl name="Incall Capture Stream1" value="DL" />
-  </path>
-
-  <path name="in-call-capture-source-1 (VOICE_UPLINK)">
-    <ctl name="Incall Capture Stream1" value="UL" />
-  </path>
-
-  <path name="in-call-capture-source-1 (VOICE_CALL)">
-    <ctl name="Incall Capture Stream1" value="UL_DL" />
-  </path>
-
-  <path name="in-call-capture-source-1">
-    <path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
-  </path>
-
-  <path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
-    <ctl name="Incall Capture Stream2" value="DL" />
-  </path>
-
-  <path name="in-call-capture-source-2 (VOICE_UPLINK)">
-    <ctl name="Incall Capture Stream2" value="UL" />
-  </path>
-
-  <path name="in-call-capture-source-2 (VOICE_CALL)">
-    <ctl name="Incall Capture Stream2" value="UL_DL" />
-  </path>
-
-  <path name="in-call-capture-source-2">
-    <path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
-  </path>
-
  <!-- cs35l41 specific path to load firmware in cs35l41.c -->
  <path name="cs35l41-load-protection-firmware-start">
    <!-- Enable it after get the protection firmware -->
@@ -1480,7 +1473,7 @@
  <path name="adapted-voice-speaker">
    <ctl name="R Boost Peak Current Limit" value="3.50A" />
    <ctl name="Boost Peak Current Limit" value="3.50A" />
-    <ctl name="Digital PCM Volume" value="817" />
+    <ctl name="Digital PCM Volume" value="800" />
    <ctl name="R Digital PCM Volume" value="817" />
  </path>
  <path name="adapted-voice-speaker-battery-throttled">
--- a/audio/shiba/audio-tables.mk
+++ b/audio/shiba/audio-tables.mk
@@ -82,13 +82,3 @@ PRODUCT_COPY_FILES += \
    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps

 endif
-
-ifeq ($(USE_AUDIO_HAL_AIDL),true)
-# Offload spatializer config
-PRODUCT_COPY_FILES += \
-    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
-    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
-    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
-    device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
-
-endif
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -173,14 +173,14 @@
    </input_backend_cfg_mic_mapping>

    <usecase_attr>
-	    <!-- for output with AUDIO_OUTPUT_FLAG_RAW, 40 periods * 48 frames/period * 2ch * 4(s32) = 15360 bytes -->
-        <usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="false" period="48" period_num="40"/>
+        <!-- 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, 2 * 40ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
+        <!-- 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 -->
@@ -308,7 +308,7 @@
        <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"/>
        <module libname="audio_fortemedia_aoc.so" argu="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" argu="Blackbird,Condor=0,46.35,0.1950549451;54.6,57,0.98625"/>
+        <module libname="audio_sounddose_aoc.so"/>
        <module libname="liboffloadeffect.so"/>
        <module libname="audio_amcs_ext.so"/>
        <module libname="audio_bluenote_aoc.so"/>
--- a/audio/shiba/config/audio_policy_configuration.xml
+++ b/audio/shiba/config/audio_policy_configuration.xml
@@ -51,8 +51,8 @@
                             samplingRates="8000 16000 24000 32000 44100 48000"
                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             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"
@@ -138,6 +138,10 @@
                </devicePort>
                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" 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">
@@ -157,6 +161,8 @@
                </devicePort>
                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" 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"
--- a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -51,8 +51,8 @@
                             samplingRates="8000 16000 24000 32000 44100 48000"
                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             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"
@@ -138,6 +138,10 @@
                </devicePort>
                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" 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">
@@ -157,6 +161,8 @@
                </devicePort>
                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" 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">
--- a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -131,6 +131,10 @@
                </devicePort>
                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" 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">
@@ -150,6 +154,8 @@
                </devicePort>
                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" 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">
--- a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
@@ -51,8 +51,8 @@
                             samplingRates="8000 16000 24000 32000 44100 48000"
                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
                    <profile name="" format="AUDIO_FORMAT_OPUS"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             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"
@@ -138,6 +138,10 @@
                </devicePort>
                <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
                </devicePort>
+                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
+                </devicePort>
+                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" 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">
@@ -157,6 +161,8 @@
                </devicePort>
                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
                </devicePort>
+                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" 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"
--- a/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
+++ b/audio/shiba/config/bluetooth_with_le_audio_policy_configuration_7_0.xml
@@ -11,7 +11,6 @@
                     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"
@@ -52,7 +51,6 @@
        <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"
@@ -68,8 +66,6 @@
        <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"/>
+               sources="le audio output"/>
    </routes>
 </module>
--- a/audio/shiba/tuning/spatializer/base
+++ b/audio/shiba/tuning/spatializer/base
--- a/audio/shiba/tuning/spatializer/mode_2_ch
+++ b/audio/shiba/tuning/spatializer/mode_2_ch
--- a/audio/shiba/tuning/spatializer/mode_6_ch
+++ b/audio/shiba/tuning/spatializer/mode_6_ch
--- a/audio/shiba/tuning/spatializer/mode_xaural
+++ b/audio/shiba/tuning/spatializer/mode_xaural
--- a/avf/Android.bp
+++ b/avf/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+prebuilt_etc {
+    name: "shusky_assignable_devices.xml",
+    src: "assignable_devices.xml",
+    filename: "assignable_devices.xml",
+    vendor: true,
+    relative_install_path: "avf",
+}
--- a/avf/assignable_devices.xml
+++ b/avf/assignable_devices.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<devices>
+    <device>
+        <kind>eh</kind>
+        <dtbo_label>eh</dtbo_label>
+        <sysfs_path>/sys/bus/platform/devices/16d00000.eh</sysfs_path>
+    </device>
+</devices>
--- a/bluetooth/audio_set_configurations.json
+++ b/bluetooth/audio_set_configurations.json
--- a/bluetooth/audio_set_scenarios.json
+++ b/bluetooth/audio_set_scenarios.json
@@ -1,259 +0,0 @@
-{
-    "_comments_": [
-        "== Audio Set Scenarios ==",
-        "  Each defined scenario references externally defined audio set",
-        "  configurations, listed in the order of priority."
-    ],
-    "scenarios": [
-        {
-            "name": "Conversational",
-            "configurations": [
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_2",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_2",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_2",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_2",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_4_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_3_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_32_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_24_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_1_Balanced_Reliability",
-                "VND_SingleDev_TwoChanStereoSnk_OneChanStereoSrc_32khz_60oct_R3_L22_1",
-                "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability"
-            ]
-        },
-        {
-            "name": "Media",
-            "configurations": [
-                "Two-OneChan-SnkAse-Lc3_48_4_High_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4_2",
-                "Two-OneChan-SnkAse-Lc3_48_2_High_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_2_2",
-                "Two-OneChan-SnkAse-Lc3_48_3_High_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_3_2",
-                "Two-OneChan-SnkAse-Lc3_48_1_High_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_1_2",
-                "Two-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_24_2_2",
-                "Two-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_16_2_2",
-                "Two-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_16_1_2",
-                "One-TwoChan-SnkAse-Lc3_48_4_High_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4_2",
-                "One-TwoChan-SnkAse-Lc3_48_2_High_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_2_2",
-                "One-TwoChan-SnkAse-Lc3_48_3_High_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_3_2",
-                "One-TwoChan-SnkAse-Lc3_48_1_High_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_1_2",
-                "One-TwoChan-SnkAse-Lc3_24_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_24_2_2",
-                "One-TwoChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_16_2_2",
-                "One-TwoChan-SnkAse-Lc3_16_1_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_16_1_2",
-                "One-OneChan-SnkAse-Lc3_48_4_High_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_4_2",
-                "One-OneChan-SnkAse-Lc3_48_2_High_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_2_2",
-                "One-OneChan-SnkAse-Lc3_48_3_High_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_3_2",
-                "One-OneChan-SnkAse-Lc3_48_1_High_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_1_2",
-                "One-OneChan-SnkAse-Lc3_32_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_32_2_2",
-                "One-OneChan-SnkAse-Lc3_32_1_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_32_1_2",
-                "One-OneChan-SnkAse-Lc3_24_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_24_2_2",
-                "One-OneChan-SnkAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_16_2_2",
-                "One-OneChan-SnkAse-Lc3_16_1_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_16_1_2",
-                "VND_DualDev_OneChanStereoSnk_48khz_100octs_High_Reliability_1",
-                "VND_DualDev_OneChanStereoSnk_48khz_100octs_R15_L70_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_High_Reliability_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_100octs_R15_L70_1",
-                "VND_SingleDev_OneChanStereoSnk_48khz_100octs_High_Reliability_1",
-                "VND_SingleDev_OneChanStereoSnk_48khz_100octs_R15_L70_1",
-                "Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability"
-            ]
-        },
-        {
-            "name": "Game",
-            "configurations": [
-                "One-TwoChan-SnkAse-Lc3_48_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_48_3_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_48_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_24_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_24_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Low_Latency",
-                "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_TwoChanStereoSrc_16khz_30octs_Balanced_Reliability_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_TwoChanStereoSrc_16khz_30octs_R3_L12_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_High_Reliability_1",
-                "VND_SingleDev_TwoChanStereoSnk_48khz_75octs_R5_L12_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_48_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_48_3_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_48_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_32_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_24_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_24_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1_Low_Latency"
-            ]
-        },
-        {
-            "name": "VoiceAssistants",
-            "configurations": [
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Balanced_Reliability",
-                "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-Two-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "Two-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-TwoChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_24_2_Balanced_Reliability",
-                "One-OneChan-SnkAse-Lc3_48_4-One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability"
-            ]
-        },
-        {
-            "name": "Live",
-            "configurations": [
-                "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_Balanced_Reliability_1",
-                "VND_SingleDev_TwoChanStereoSrc_48khz_100octs_R11_L40_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-Two-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-Two-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-Two-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-TwoChan-SnkAse-Lc3_48_2-Two-TwoChan-SrcAse-Lc3_48_2_Balanced_Reliability",
-                "Two-TwoChan-SnkAse-Lc3_48_1-Two-TwoChan-SrcAse-Lc3_48_1_Balanced_Reliability",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-TwoChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-TwoChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-TwoChan-SrcAse-Lc3_16_1_1",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-TwoChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "Two-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "Two-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_32_2-One-OneChan-SrcAse-Lc3_32_2_1",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_2-One-OneChan-SrcAse-Lc3_16_2_1",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_Low_Latency",
-                "One-OneChan-SnkAse-Lc3_16_1-One-OneChan-SrcAse-Lc3_16_1_1",
-                "One-OneChan-SrcAse-Lc3_48_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_48_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_32_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_32_1_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_2_Balanced_Reliability",
-                "One-OneChan-SrcAse-Lc3_16_1_Balanced_Reliability"
-            ]
-        }
-    ]
-}
--- a/bluetooth/bt_vendor_overlay.conf
+++ b/bluetooth/bt_vendor_overlay.conf
@@ -14,19 +14,6 @@ HwStageDoesNotCtrlPowerPinFromAoc = PROTO1.0-EVT1.0-EVT1.2
 # supported by BT firmware.
 HwStageWithOldChipFwNoLongerSupport = PROTO1.0-PROTO1.1

-# Priority of uart type
-# HciUartSocket = 0
-# SerialUartPort = 1
-# SerialAocUartPort = 2
-# UserialInvalid = 3
-UserialTypePriority = 2-1
-
-# <string> The hardware support which offload capability
-BtOffloadCap = AOC
-
-# <string> The BT Offload Trunk Flag Group Name
-BtOffloadTrunkGroup = 23P_AOC
-
 # <boolean> APM Uart skip suspend to aovid hold system too long when BT using AOC UART
 ApmUartSkipSuspend = true

@@ -40,5 +27,3 @@ BqrEventMaskValueUpdate = 295006
 BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus

 BtOpusEnabled = true
-
-BtHalRecoveryByRestart = true
--- a/bluetooth/bt_vendor_overlay_ripcurrent.conf
+++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf
@@ -3,19 +3,6 @@
 # Uart port name
 UartPort = /dev/ttySAC18

-# Priority of uart type
-# HciUartSocket = 0
-# SerialUartPort = 1
-# SerialAocUartPort = 2
-# UserialInvalid = 3
-UserialTypePriority = 2-1
-
-# <string> The hardware support which offload capability
-BtOffloadCap = AOC
-
-# <string> The BT Offload Trunk Flag Group Name
-BtOffloadTrunkGroup = 23P_AOC
-
 # Sar backOff high resolution support
 SarBackOffHighResolution = true

--- a/bluetooth/le_audio_codec_capabilities.xml
+++ b/bluetooth/le_audio_codec_capabilities.xml
@@ -52,6 +52,7 @@
    <scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
    <scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
    <!-- broadcast -->
+    <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_4"/>
    <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_48_2"/>
    <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_24_2"/>
    <scenario encode="invalid" decode="invalid" broadcast="BcastStereo_16_2"/>
@@ -75,6 +76,7 @@
    <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
    <configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
    <configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
+    <configuration name="BcastStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="BROADCAST_STEREO"/>
    <configuration name="BcastStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="BROADCAST_STEREO"/>
    <configuration name="BcastStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="BROADCAST_STEREO"/>
    <configuration name="BcastStereo_16_2" codecConfiguration="LC3_16k_2" strategyConfiguration="BROADCAST_STEREO"/>
--- a/conf/init.husky.rc
+++ b/conf/init.husky.rc
@@ -41,7 +41,6 @@ on post-fs-data
 # Bluetooth
 on post-fs-data
    chown bluetooth system /proc/bluetooth/timesync
-    chown bluetooth system /proc/bluetooth/sleep/wakelock_ctrl

 # Start the twoshay touch service
 on property:vendor.device.modules.ready=1
@@ -69,9 +68,6 @@ on property:vendor.all.modules.ready=1
    chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
    chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
    chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms
    chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
    chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
    chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
--- a/conf/init.shiba.rc
+++ b/conf/init.shiba.rc
@@ -37,7 +37,6 @@ on post-fs-data
 # Bluetooth
 on post-fs-data
    chown bluetooth system /proc/bluetooth/timesync
-    chown bluetooth system /proc/bluetooth/sleep/wakelock_ctrl

 # Start the twoshay touch service
 on property:vendor.device.modules.ready=1
@@ -63,9 +62,6 @@ on property:vendor.all.modules.ready=1
    chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
    chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
    chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_bank
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_index
-    chown system system /sys/bus/i2c/devices/0-0043/default/braking_time_ms
    chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
    chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
    chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
--- a/device-evolution.mk
+++ b/device-evolution.mk
@@ -1,6 +1,8 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #

-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution
+# Udfps
+TARGET_HAS_UDFPS += true
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -17,21 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)

-ifdef RELEASE_GOOGLE_HUSKY_RADIO_DIR
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
-endif
-ifdef RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR
-RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
-endif
-RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)
-$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR))
+TARGET_KERNEL_DIR ?= device/google/shusky-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers

+ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION)
+endif

-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_HUSKY_DIR)/kernel-headers
+ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers
+endif

 LOCAL_PATH := device/google/shusky

@@ -42,16 +38,13 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),)
    include device/google/shusky/uwb/uwb_calibration.mk
 endif

-ifneq ($(TARGET_BOOTS_16K),true)
-PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION)
-endif

 $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/husky/device-vendor-husky.mk)
 $(call inherit-product-if-exists, vendor/google_devices/husky/proprietary/device-vendor.mk)
-$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk)
+$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal-r63/Device.mk)
 $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk)

 # display
@@ -72,9 +65,10 @@ endif
 include device/google/shusky/camera/camera.mk
 include device/google/shusky/audio/husky/audio-tables.mk
 include device/google/zuma/device-shipping-common.mk
+include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/stm/predump_stm20.mk
-include device/google/gs-common/touch/gti/predump_gti.mk
+include device/google/gs-common/touch/stm/stm20.mk
+include device/google/gs-common/touch/gti/gti.mk
 include device/google/gs-common/touch/touchinspector/touchinspector.mk

 # Init files
@@ -124,10 +118,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
    persist.bluetooth.a2dp_offload.disabled=false \
    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus

-# Enable Bluetooth AutoOn feature
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.server.automatic_turn_on=true
-
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
    $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
@@ -141,27 +131,19 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.bluetooth.finder.supported=true

-ifeq ($(USE_AUDIO_HAL_AIDL),true)
-# AIDL
-
-else
-# HIDL
-
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio

+# declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+       ro.audio.spatializer_enabled=true
+
 # Sound Dose
 PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
 	audio_sounddose_aoc

-endif
-
-# declare use of spatial audio
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.audio.spatializer_enabled=true
-
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
@@ -172,20 +154,24 @@ PRODUCT_PROPERTY_OVERRIDES += \
    ro.gms.dck.se_capability=1

 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
    hci_inject
+endif

 # Bluetooth OPUS codec
 PRODUCT_PRODUCT_PROPERTIES += \
    persist.bluetooth.opus.enabled=true

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 # Bluetooth SAR test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
    sar_test

 # Bluetooth EWP test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
    ewp_tool
+endif

 # Bluetooth AAC VBR
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -225,10 +211,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.ccp.server.enabled?=true \
 	bluetooth.profile.vcp.controller.enabled?=true

-# Bluetooth LE Audio Broadcast
+ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
 PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.bap.broadcast.assist.enabled=true \
 	bluetooth.profile.bap.broadcast.source.enabled=true
+endif

 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -241,7 +228,7 @@ PRODUCT_COPY_FILES += \

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

 # Bluetooth LE Audio CIS handover to SCO
 # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
@@ -252,10 +239,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
    bluetooth.leaudio.dual_bidirection_swb.supported=true

-# Support LE & Classic concurrent encryption (b/330704060)
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.ble.allow_enc_with_bredr=true
-
 # Support One-Handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.support_one_handed_mode=true
@@ -303,6 +286,13 @@ PRODUCT_PACKAGES += \

 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
+endif

 # UWB
 PRODUCT_SOONG_NAMESPACES += \
@@ -315,29 +305,16 @@ include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_COPY_FILES += \
       device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer

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

 # Set zram size
@@ -346,8 +323,14 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.device_config.configuration.disable_rescue_party=true

 # Fingerprint HAL
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
+else
+APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
+endif
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@@ -388,7 +371,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1

 # blocking zone for min idle refresh rate
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=15:10,:1
+    vendor.primarydisplay.min_idle_refresh_rate.default=1 \
+    vendor.primarydisplay.min_idle_refresh_rate.blocking_zone=10 \
+    vendor.primarydisplay.min_idle_refresh_rate.blocking_zone_dbv=492

 # Display ACL
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.acl.default=0
@@ -398,7 +383,6 @@ PRODUCT_COPY_FILES += \
 	device/google/shusky/husky/panel_config_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-hk3_cal0.pb

 # Vibrator HAL
-$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \
@@ -409,41 +393,26 @@ PRODUCT_VENDOR_PROPERTIES += \
    persist.vendor.vibrator.hal.context.scale=60 \
    persist.vendor.vibrator.hal.context.fade=true \
    persist.vendor.vibrator.hal.context.cooldowntime=1600 \
-    persist.vendor.vibrator.hal.context.settlingtime=5000
-
-# Override Output Distortion Gain
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.audio.hapticgenerator.distortion.output.gain=0.38
+    persist.vendor.vibrator.hal.context.settlingtime=5000 \
+    ro.vendor.vibrator.hal.dbc.enable=true \
+    ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \
+    ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \
+    ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \
+    ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \
+    ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \
+    ro.vendor.vibrator.hal.pm.activetimeout=5

 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_HUSKY
 TARGET_SVN ?= $(RELEASE_SVN_HUSKY)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 38
+TARGET_SVN ?= 36
 endif

 PRODUCT_VENDOR_PROPERTIES += \
    ro.vendor.build.svn=$(TARGET_SVN)

-# Set device family property for SMR
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.build.device_family=HK3SB3AK3
-
-# Set build properties for SMR builds
-ifeq ($(RELEASE_IS_SMR), true)
-    ifneq (,$(RELEASE_BASE_OS_HUSKY))
-        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_HUSKY)
-    endif
-endif
-
-# Set build properties for EMR builds
-ifeq ($(RELEASE_IS_EMR), true)
-    ifneq (,$(RELEASE_BASE_OS_HUSKY))
-        PRODUCT_PROPERTY_OVERRIDES += \
-        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_HUSKY)
-    endif
-endif
 # WLC userdebug specific
 ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
    PRODUCT_COPY_FILES += \
@@ -494,6 +463,9 @@ PRODUCT_PRODUCT_PROPERTIES ?= \
 PRODUCT_VENDOR_PROPERTIES += \
    persist.vendor.camera.exif_reveal_make_model=true

+# AVF assignable devices xml
+PRODUCT_PACKAGES += shusky_assignable_devices.xml
+
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
    ro.usb.uvc.enabled=true
@@ -509,34 +481,3 @@ PRODUCT_PACKAGES += \
    NoCutoutOverlay \
    AvoidAppsInCutoutOverlay

-# ETM
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
-endif
-
-PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-
-ifneq ($(wildcard vendor/arm/mali/valhall),)
-PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
-endif
-
-# Bluetooth device id
-# Husky: 0x410D
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=16653
-
-# Set support for LEA multicodec
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.core.le_audio.codec_extension_aidl.enabled=true
-
-# LE Audio configuration scenarios
-PRODUCT_COPY_FILES += \
-    device/google/shusky/bluetooth/audio_set_scenarios.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_scenarios.json
-
-PRODUCT_COPY_FILES += \
-    device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
-
-# Enable APF by default
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.powerhal.apf_disabled=false \
-    vendor.powerhal.apf_enabled=true
--- a/device-lineage.mk
+++ b/device-lineage.mk
@@ -1,10 +1,11 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #

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

 # ANGLE - Almost Native Graphics Layer Engine
 PRODUCT_PACKAGES += \
@@ -15,9 +16,11 @@ PRODUCT_COPY_FILES += \
    frameworks/native/data/etc/android.hardware.telephony.euicc.mep.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.mep.xml \
    frameworks/native/data/etc/android.hardware.telephony.euicc.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/android.hardware.telephony.euicc.xml

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

 # PowerShare
 include hardware/google/pixel/powershare/device.mk
@@ -31,16 +34,16 @@ include device/google/gs-common/wireless_charger/wireless_charger.mk
 PRODUCT_PACKAGES += \
    libexynosv4l2

-# GNSS
-PRODUCT_PACKAGES += \
-    android.hardware.sensors-V2-ndk.vendor:64
-
 # Graphics
 PRODUCT_PACKAGES += \
    libEGL_angle \
    libGLESv1_CM_angle \
    libGLESv2_angle

+# Identity credential
+PRODUCT_PACKAGES += \
+    android.hardware.identity_credential.xml
+
 # Sensors
 PRODUCT_PACKAGES += \
    sensors.dynamic_sensor_hal
--- a/device-ripcurrent.mk
+++ b/device-ripcurrent.mk
@@ -17,14 +17,17 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)

-RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR)
-$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT_DIR))
+TARGET_KERNEL_DIR ?= device/google/shusky-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers

+ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION)
+endif

-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION)
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers
+ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers
+endif

 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
    USE_UWBFIELDTESTQM := true
@@ -45,6 +48,7 @@ CAMERA_PRODUCT ?= ripcurrent
 include device/google/shusky/audio/ripcurrent/audio-tables.mk
 include device/google/shusky/camera/camera.mk
 include device/google/zuma/device-shipping-common.mk
+include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
 include device/google/gs-common/gps/brcm/cbd_gps.mk
 include device/google/gs-common/touch/stm/stm20.mk
@@ -187,10 +191,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
    bluetooth.leaudio.dual_bidirection_swb.supported=true

-# Support LE & Classic concurrent encryption (b/330704060)
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.ble.allow_enc_with_bredr=true
-
 # Keymaster HAL
 #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service

@@ -231,6 +231,13 @@ PRODUCT_PACKAGES += \

 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
+endif

 # UWB
 PRODUCT_SOONG_NAMESPACES += \
@@ -269,7 +276,6 @@ PRODUCT_VENDOR_PROPERTIES += \
    persist.vendor.camera.front_720P_always_binning=true

 # Vibrator HAL
-$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
    persist.vendor.vibrator.hal.chirp.enabled=0 \
@@ -279,8 +285,3 @@ PRODUCT_VENDOR_PROPERTIES += \
 # PKVM Memory Reclaim
 PRODUCT_VENDOR_PROPERTIES += \
    hypervisor.memory_reclaim.supported=1
-
-# Enable APF by default
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.powerhal.apf_disabled=false \
-    vendor.powerhal.apf_enabled=true
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -17,28 +17,20 @@
 # Restrict the visibility of Android.bp files to improve build analysis time
 $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)

-ifdef RELEASE_GOOGLE_SHIBA_RADIO_DIR
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR)
-endif
-ifdef RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR
-RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_SHIBA_RADIOCFG_DIR)
-endif
-RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)
-$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR))
+TARGET_KERNEL_DIR ?= device/google/shusky-kernel
+TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers

+ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION
+TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION)
+endif

-TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers
+ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR
+TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)
+TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers
+endif

 LOCAL_PATH := device/google/shusky

-ifneq ($(TARGET_BOOTS_16K),true)
-PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION)
-endif
-
 $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk)
@@ -56,8 +48,9 @@ endif
 include device/google/shusky/camera/camera.mk
 include device/google/shusky/audio/shiba/audio-tables.mk
 include device/google/zuma/device-shipping-common.mk
+include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/bcmbt/bluetooth.mk
-include device/google/gs-common/touch/gti/predump_gti.mk
+include device/google/gs-common/touch/gti/gti.mk

 # Init files
 PRODUCT_COPY_FILES += \
@@ -109,10 +102,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
    persist.bluetooth.a2dp_offload.disabled=false \
    persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus

-# Enable Bluetooth AutoOn feature
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.server.automatic_turn_on=true
-
 # Bluetooth Tx power caps
 PRODUCT_COPY_FILES += \
 	$(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
@@ -129,27 +118,19 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.bluetooth.finder.supported=true

-ifeq ($(USE_AUDIO_HAL_AIDL),true)
-# AIDL
-
-else
-# HIDL
-
 # Spatial Audio
 PRODUCT_PACKAGES += \
 	libspatialaudio

+# declare use of spatial audio
+PRODUCT_PROPERTY_OVERRIDES += \
+       ro.audio.spatializer_enabled=true
+
 # Sound Dose
 PRODUCT_PACKAGES += \
 	android.hardware.audio.sounddose-vendor-impl \
 	audio_sounddose_aoc

-endif
-
-# declare use of spatial audio
-PRODUCT_PROPERTY_OVERRIDES += \
-	ro.audio.spatializer_enabled=true
-
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
@@ -160,20 +141,24 @@ PRODUCT_PROPERTY_OVERRIDES += \
    ro.gms.dck.se_capability=1

 # Bluetooth hci_inject test tool
-PRODUCT_PACKAGES_ENG += \
+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
+PRODUCT_PACKAGES_DEBUG += \
    hci_inject
+endif

 # Bluetooth OPUS codec
 PRODUCT_PRODUCT_PROPERTIES += \
    persist.bluetooth.opus.enabled=true

+ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
 # Bluetooth SAR test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
    sar_test

 # Bluetooth EWP test tool
-PRODUCT_PACKAGES_ENG += \
+PRODUCT_PACKAGES_DEBUG += \
    ewp_tool
+endif

 # Bluetooth AAC VBR
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -213,10 +198,11 @@ PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.ccp.server.enabled?=true \
 	bluetooth.profile.vcp.controller.enabled?=true

-# Bluetooth LE Audio Broadcast
+ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true)
 PRODUCT_PRODUCT_PROPERTIES += \
 	bluetooth.profile.bap.broadcast.assist.enabled=true \
 	bluetooth.profile.bap.broadcast.source.enabled=true
+endif

 # Bluetooth LE Audio enable hardware offloading
 PRODUCT_PRODUCT_PROPERTIES += \
@@ -229,7 +215,7 @@ PRODUCT_COPY_FILES += \

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

 # Bluetooth LE Audio CIS handover to SCO
 # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
@@ -240,10 +226,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_PRODUCT_PROPERTIES += \
    bluetooth.leaudio.dual_bidirection_swb.supported=true

-# Support LE & Classic concurrent encryption (b/330704060)
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.ble.allow_enc_with_bredr=true
-
 # Support One-Handed mode
 PRODUCT_PRODUCT_PROPERTIES += \
    ro.support_one_handed_mode=true
@@ -290,6 +272,13 @@ PRODUCT_PACKAGES += \

 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2
+else
+PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk
+endif

 # Location
 # SDK build system
@@ -298,29 +287,16 @@ include device/google/gs-common/gps/brcm/device.mk
 PRODUCT_COPY_FILES += \
       device/google/shusky/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer

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

 # Set zram size
@@ -329,8 +305,14 @@ PRODUCT_VENDOR_PROPERTIES += \
 	persist.device_config.configuration.disable_rescue_party=true

 # Fingerprint HAL
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
+else
+APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk
+endif
 GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk)
 ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
 $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk)
@@ -375,7 +357,6 @@ PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1

 # Vibrator HAL
-$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION)))
 ACTUATOR_MODEL := luxshare_ict_081545
 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
 PRODUCT_VENDOR_PROPERTIES += \
@@ -386,41 +367,26 @@ PRODUCT_VENDOR_PROPERTIES += \
    persist.vendor.vibrator.hal.context.scale=60 \
    persist.vendor.vibrator.hal.context.fade=true \
    persist.vendor.vibrator.hal.context.cooldowntime=1600 \
-    persist.vendor.vibrator.hal.context.settlingtime=5000
-
-# Override Output Distortion Gain
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.audio.hapticgenerator.distortion.output.gain=0.38
+    persist.vendor.vibrator.hal.context.settlingtime=5000 \
+    ro.vendor.vibrator.hal.dbc.enable=true \
+    ro.vendor.vibrator.hal.dbc.envrelcoef=8353728 \
+    ro.vendor.vibrator.hal.dbc.riseheadroom=1909602 \
+    ro.vendor.vibrator.hal.dbc.fallheadroom=1909602 \
+    ro.vendor.vibrator.hal.dbc.txlvlthreshfs=2516583 \
+    ro.vendor.vibrator.hal.dbc.txlvlholdoffms=0 \
+    ro.vendor.vibrator.hal.pm.activetimeout=5

 # Increment the SVN for any official public releases
 ifdef RELEASE_SVN_SHIBA
 TARGET_SVN ?= $(RELEASE_SVN_SHIBA)
 else
 # Set this for older releases that don't use build flag
-TARGET_SVN ?= 38
+TARGET_SVN ?= 36
 endif

 PRODUCT_VENDOR_PROPERTIES += \
    ro.vendor.build.svn=$(TARGET_SVN)

-# Set device family property for SMR
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.build.device_family=HK3SB3AK3
-
-# Set build properties for SMR builds
-ifeq ($(RELEASE_IS_SMR), true)
-    ifneq (,$(RELEASE_BASE_OS_SHIBA))
-        PRODUCT_BASE_OS := $(RELEASE_BASE_OS_SHIBA)
-    endif
-endif
-
-# Set build properties for EMR builds
-ifeq ($(RELEASE_IS_EMR), true)
-    ifneq (,$(RELEASE_BASE_OS_SHIBA))
-        PRODUCT_PROPERTY_OVERRIDES += \
-        ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_SHIBA)
-    endif
-endif
 # P23 Devices no longer need rlsservice
 PRODUCT_VENDOR_PROPERTIES += \
    persist.vendor.camera.rls_supported=false
@@ -463,6 +429,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
    persist.vendor.camera.exif_reveal_make_model=true

+# AVF assignable devices xml
+PRODUCT_PACKAGES += shusky_assignable_devices.xml
+
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
    ro.usb.uvc.enabled=true
@@ -478,34 +447,3 @@ PRODUCT_PACKAGES += \
    NoCutoutOverlay \
    AvoidAppsInCutoutOverlay

-# ETM
-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
-endif
-
-PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true
-
-ifneq ($(wildcard vendor/arm/mali/valhall),)
-PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true
-endif
-
-# Bluetooth device id
-# Shiba: 0x410E
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.device_id.product_id=16654
-
-# Set support for LEA multicodec
-PRODUCT_PRODUCT_PROPERTIES += \
-    bluetooth.core.le_audio.codec_extension_aidl.enabled=true
-
-# LE Audio configuration scenarios
-PRODUCT_COPY_FILES += \
-    device/google/shusky/bluetooth/audio_set_scenarios.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_scenarios.json
-
-PRODUCT_COPY_FILES += \
-    device/google/shusky/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
-
-# Enable APF by default
-PRODUCT_VENDOR_PROPERTIES += \
-    vendor.powerhal.apf_disabled=false \
-    vendor.powerhal.apf_enabled=true
--- a/evolution.dependencies
+++ b/evolution.dependencies
@@ -4,8 +4,8 @@
    "target_path": "device/google/zuma"
  },
  {
-    "repository": "device/google/shusky-kernels/6.1",
-    "target_path": "device/google/shusky-kernels/6.1",
+    "repository": "device/google/shusky-kernel",
+    "target_path": "device/google/shusky-kernel",
    "remote": "aosp-shusky"
  }
 ]
--- a/factory_husky.mk
+++ b/factory_husky.mk
@@ -35,6 +35,3 @@ PRODUCT_PROPERTY_OVERRIDES += \

 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test
-
-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
--- a/factory_ripcurrent.mk
+++ b/factory_ripcurrent.mk
@@ -35,6 +35,3 @@ PRODUCT_PROPERTY_OVERRIDES += \

 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_sb3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test
-
-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
--- a/factory_shiba.mk
+++ b/factory_shiba.mk
@@ -35,6 +35,3 @@ PRODUCT_PROPERTY_OVERRIDES += \

 # Factory binaries of camera
 PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update
-
-# preloaded_nanoapps.json
-PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory
--- a/husky/Android.bp
+++ b/husky/Android.bp
@@ -1,11 +0,0 @@
-//
-// SPDX-FileCopyrightText: 2024 The LineageOS Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-prebuilt_etc {
-    name: "init.recovery.husky.touch.rc",
-    src: "init.recovery.touch.rc",
-    sub_dir: "init",
-    recovery: true,
-}
--- a/husky/BoardConfig.mk
+++ b/husky/BoardConfig.mk
@@ -18,7 +18,6 @@
 BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true

 # The modules which need to be loaded in sequential
-BOARD_KERNEL_CMDLINE += fips140.load_sequential=1
 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1
 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
 BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
@@ -26,10 +25,21 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt
 TARGET_BOOTLOADER_BOARD_NAME := husky

-ifdef PHONE_CAR_BOARD_PRODUCT
-    include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR)
+RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR)
+ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1
+else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION)))
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2
 else
-    TARGET_SCREEN_DENSITY := 480
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk
+endif
+
+
+ifdef PHONE_CAR_BOARD_PRODUCT
+    include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
+else
+    TARGET_SCREEN_DENSITY := 480 
 endif

 BOARD_USES_GENERIC_AUDIO := true
@@ -45,16 +55,18 @@ include device/google/shusky/device-shusky-common.mk

 include device/google/zuma/BoardConfig-common.mk
 -include vendor/google_devices/zuma/prebuilts/BoardConfigVendor.mk
-include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
 -include vendor/google_devices/husky/proprietary/BoardConfigVendor.mk
 include device/google/shusky/sepolicy/husky-sepolicy.mk
 include device/google/shusky/wifi/BoardConfig-wifi.mk

-ifneq (,$(filter eng, $(TARGET_BUILD_VARIANT)))
-include device/google/common/etm/5_15/BoardUserdebugModules.mk
+# Android Virtualization Framework (AVF) team is using husky with hypervisor in
+# nvhe mode as a development platform to build infrastructure that supports
+# assigning devices to guest VMs.
+#
+# TODO(b/278008514): remove this once we have builds from our kernel branch.
+ifeq ($(HUSKY_ENABLE_DEVICE_ASSIGNMENT), true)
+BOARD_KERNEL_CMDLINE += kvm-arm.mode=nvhe
 endif

-DEVICE_PATH := device/google/shusky
-VENDOR_PATH := vendor/google/husky
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk
-include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk
+include device/google/shusky/husky/BoardConfigLineage.mk
+include device/google/shusky/husky/BoardConfigEvolution.mk
--- a/husky/BoardConfigEvolution.mk
+++ b/husky/BoardConfigEvolution.mk
@@ -1,6 +1,7 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #

-include $(DEVICE_PATH)/BoardConfigEvolution.mk
+include device/google/shusky/BoardConfigEvolution.mk
--- a/husky/BoardConfigLineage.mk
+++ b/husky/BoardConfigLineage.mk
@@ -1,9 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #

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

-include $(VENDOR_PATH)/BoardConfigVendor.mk
+include vendor/google/husky/BoardConfigVendor.mk
--- a/husky/device-evolution.mk
+++ b/husky/device-evolution.mk
@@ -1,8 +1,9 @@
 #
-# SPDX-FileCopyrightText: 2024 The Evolution X Project
+# Copyright (C) 2024 The Evolution X Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #

-$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk)
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/husky/overlay-evolution

-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution
+$(call inherit-product, $(LOCAL_PATH)/device-evolution.mk)
--- a/husky/device-lineage.mk
+++ b/husky/device-lineage.mk
@@ -1,18 +1,11 @@
 #
-# SPDX-FileCopyrightText: 2021-2024 The LineageOS Project
-# SPDX-FileCopyrightText: 2021-2024 The Calyx Institute
+# Copyright (C) 2023 The LineageOS Project
+#
 # SPDX-License-Identifier: Apache-2.0
 #

-$(call inherit-product, $(DEVICE_PATH)/device-lineage.mk)
+DEVICE_PACKAGE_OVERLAYS += device/google/shusky/husky/overlay-lineage

-DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage
+TARGET_VENDOR_PROP += device/google/shusky/husky/vendor.prop

-PRODUCT_PACKAGES += \
-    PixelDisplayServiceOverlayHusky
-
-TARGET_VENDOR_PROP += $(DEVICE_PATH)/$(DEVICE_CODENAME)/vendor.prop
-
-# Init
-PRODUCT_PACKAGES += \
-    init.recovery.husky.touch.rc
+$(call inherit-product, device/google/shusky/device-lineage.mk)
--- a/husky/extract-files.py
+++ b/husky/extract-files.py
@@ -1,110 +0,0 @@
-#!/usr/bin/env -S PYTHONPATH=../../../../tools/extract-utils python3
-#
-# SPDX-FileCopyrightText: 2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-from extract_utils.extract import extract_fns_user_type
-from extract_utils.extract_pixel import (
-    extract_pixel_factory_image,
-    extract_pixel_firmware,
-    pixel_factory_image_regex,
-    pixel_firmware_regex,
-)
-from extract_utils.file import FileArgs, FileList
-from extract_utils.fixups_blob import (
-    blob_fixup,
-    blob_fixups_user_type,
-)
-from extract_utils.fixups_lib import (
-    lib_fixup_remove,
-    lib_fixups,
-    lib_fixups_user_type,
-)
-from extract_utils.main import (
-    ExtractUtils,
-    ExtractUtilsModule,
-)
-
-namespace_imports = [
-    'device/google/shusky',
-    'hardware/google/av',
-    'hardware/google/gchips',
-    'hardware/google/graphics/common',
-    'hardware/google/interfaces',
-    'hardware/google/pixel',
-]
-
-
-def lib_fixup_vendor_suffix(lib: str, partition: str, *args, **kwargs):
-    return f'{lib}_{partition}' if partition == 'vendor' else None
-
-
-lib_fixups: lib_fixups_user_type = {
-    **lib_fixups,
-    (
-        'com.google.edgetpu_app_service-V4-ndk',
-        'com.google.edgetpu_vendor_service-V2-ndk',
-        'vendor.google.whitechapel.audio.audioext@4.0',
-        'vendor.google.whitechapel.audio.extension-V4-ndk',
-    ): lib_fixup_vendor_suffix,
-    'android.hardware.sensors-V2-ndk': lib_fixup_remove,
-}
-
-blob_fixups: blob_fixups_user_type = {
-    'product/etc/felica/common.cfg': blob_fixup()
-        .patch_file('osaifu-keitai.patch'),
-    'vendor/etc/init/init.modem_logging_control.rc': blob_fixup()
-        .regex_replace(' && property:ro.debuggable=0', ''),
-}  # fmt: skip
-
-extract_fns: extract_fns_user_type = {
-    pixel_factory_image_regex: extract_pixel_factory_image,
-    pixel_firmware_regex: extract_pixel_firmware,
-}
-
-module = ExtractUtilsModule(
-    'husky',
-    'google',
-    device_rel_path='device/google/shusky/husky',
-    blob_fixups=blob_fixups,
-    lib_fixups=lib_fixups,
-    namespace_imports=namespace_imports,
-    add_generated_carriersettings_file=True,
-    add_firmware_proprietary_file=True,
-    extract_fns=extract_fns,
-)
-
-
-def fix_vendor_file_list(file_list: FileList):
-    # flp.default & gps.default have incorrect SONAME
-    # gpsd depends on android.hardware.sensors-V2-ndk & android.hardware.sensors-V3-ndk
-    disable_checkelf_file_paths = [
-        'vendor/bin/hw/gpsd',
-        'vendor/lib64/hw/flp.default.so',
-        'vendor/lib64/hw/gps.default.so',
-    ]
-    for file_path in disable_checkelf_file_paths:
-        file_list.get_file(file_path).set_arg(FileArgs.DISABLE_CHECKELF, True)
-
-    module_suffix_file_paths = [
-        'vendor/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',
-    ]
-
-    for file_path in module_suffix_file_paths:
-        file_list.get_file(file_path).set_arg(FileArgs.MODULE_SUFFIX, '_vendor')
-
-
-module.add_generated_proprietary_file(
-    'proprietary-files-vendor.txt',
-    partition='vendor',
-    skip_file_list_name='skip-files-vendor.txt',
-    fix_file_list=fix_vendor_file_list,
-)
-
-if __name__ == '__main__':
-    utils = ExtractUtils.device(module)
-    utils.run()
--- a/husky/extract-files.sh
+++ b/husky/extract-files.sh
@@ -0,0 +1,136 @@
+#!/bin/bash
+#
+# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
+# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+set -e
+
+DEVICE=husky
+VENDOR=google
+
+# Load extract_utils and do some sanity checks
+MY_DIR="${BASH_SOURCE%/*}"
+if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
+
+ANDROID_ROOT="${MY_DIR}/../../../.."
+
+export TARGET_ENABLE_CHECKELF=true
+
+# If XML files don't have comments before the XML header, use this flag
+# Can still be used with broken XML files by using blob_fixup
+export TARGET_DISABLE_XML_FIXING=true
+
+HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
+if [ ! -f "${HELPER}" ]; then
+    echo "Unable to find helper script at ${HELPER}"
+    exit 1
+fi
+source "${HELPER}"
+
+# Default to sanitizing the vendor folder before extraction
+CLEAN_VENDOR=true
+
+ONLY_FIRMWARE=
+KANG=
+SECTION=
+CARRIER_SKIP_FILES=()
+VENDOR_SKIP_FILES=()
+
+while [ "${#}" -gt 0 ]; do
+    case "${1}" in
+        --only-firmware)
+            ONLY_FIRMWARE=true
+            ;;
+        -n | --no-cleanup)
+            CLEAN_VENDOR=false
+            ;;
+        -k | --kang)
+            KANG="--kang"
+            ;;
+        -s | --section)
+            SECTION="${2}"
+            shift
+            CLEAN_VENDOR=false
+            ;;
+        *)
+            SRC="${1}"
+            ;;
+    esac
+    shift
+done
+
+if [ -z "${SRC}" ]; then
+    SRC="adb"
+fi
+
+function blob_fixup() {
+    case "${1}" in
+        product/etc/felica/common.cfg)
+            [ "$2" = "" ] && return 0
+            sed -i -e '$a00000018,1' -e '/^00000014/d' -e '/^00000015/d' "${2}"
+            ;;
+        vendor/etc/init/init.modem_logging_control.rc)
+            [ "$2" = "" ] && return 0
+            sed -i 's/ && property:ro.debuggable=0//' "${2}"
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+
+    return 0
+}
+
+function blob_fixup_dry() {
+    blob_fixup "$1" ""
+}
+
+function prepare_firmware() {
+    if [ "${SRC}" != "adb" ]; then
+        bash "${ANDROID_ROOT}"/lineage/scripts/pixel/prepare-firmware.sh "${DEVICE}" "${SRC}"
+    fi
+}
+
+# Initialize the helper
+setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
+
+if [ -z "${ONLY_FIRMWARE}" ]; then
+    extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+    generate_prop_list_from_image "product.img" "${MY_DIR}/proprietary-files-carriersettings.txt" CARRIER_SKIP_FILES carriersettings
+    extract "${MY_DIR}/proprietary-files-carriersettings.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+
+    readarray -t VENDOR_SKIP_FILES < <(cat "${MY_DIR}/skip-files-vendor.txt" | sed -E "/^[[:blank:]]*(#|$)/d")
+    VENDOR_TXT="${MY_DIR}/proprietary-files-vendor.txt"
+    generate_prop_list_from_image "vendor.img" "${VENDOR_TXT}" VENDOR_SKIP_FILES
+
+    # flp.default & gps.default have incorrect SONAME
+    # libExynosC2*Dec & libExynosC2*Enc depend on libacryl & libexynosv4l2, which are gnu makefile targets
+    set_disable_checkelf "vendor/lib64/hw/flp.default.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/hw/gps.default.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H263Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H263Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H264Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2H264Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2HevcDec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2HevcEnc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Mpeg4Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp8Enc.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Dec.so" "${VENDOR_TXT}"
+    set_disable_checkelf "vendor/lib64/libExynosC2Vp9Enc.so" "${VENDOR_TXT}"
+
+    set_module_suffix "vendor/lib64/com.google.edgetpu_app_service-V3-ndk.so" "-vendor" "${VENDOR_TXT}"
+    set_module_suffix "vendor/lib64/com.google.edgetpu_vendor_service-V2-ndk.so" "-vendor" "${VENDOR_TXT}"
+
+    extract "${MY_DIR}/proprietary-files-vendor.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+fi
+
+if [ -z "${SECTION}" ]; then
+    extract_firmware "${MY_DIR}/proprietary-firmware.txt" "${SRC}"
+fi
+
+"${MY_DIR}/setup-makefiles.sh"
--- a/husky/init.recovery.touch.rc
+++ b/husky/init.recovery.touch.rc
@@ -1,4 +0,0 @@
-on init
-   insmod /lib/modules/heatmap.ko
-   insmod /lib/modules/goog_touch_interface.ko
-   insmod /lib/modules/ftm5.ko
--- a/husky/osaifu-keitai.patch
+++ b/husky/osaifu-keitai.patch
@@ -1,24 +0,0 @@
-From aab255f2807cfc460c0dce40decd5554d49c0076 Mon Sep 17 00:00:00 2001
-From: jabashque <jabashque@gmail.com>
-Date: Mon, 5 Feb 2024 21:36:03 +0000
-Subject: [PATCH 1/1] Enable Osaifu-Keitai on non-Japanese SKUs
-
---
- common.cfg | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/common.cfg b/common.cfg
-index 3b78765..00f53cb 100644
--- a/common.cfg
-+++ b/common.cfg
-@@ -11,6 +11,5 @@
- 02030001,0
- 02030002,0
- 02030003,intent:#Intent;action=android.settings.NFC_SETTINGS;end
-00000014,content://com.google.android.pixelnfc.provider.DeviceInfoContentProvider/isJapanSku
-00000015,is_japan_sku
- 00000016,0001
-+00000018,1
-- 
-2.47.0
-
--- a/husky/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml
@@ -32,15 +32,6 @@
    <!-- Minimum screen brightness allowed by the power manager. -->
    <integer name="config_screenBrightnessDim">6</integer>

-    <!-- Default strength, in percentage, of bright color reduction when activated. -->
-    <integer name="config_reduceBrightColorsStrengthDefault">35</integer>
-
-    <!-- Minimum strength, in percentage, supported by bright color reduction. -->
-    <integer name="config_reduceBrightColorsStrengthMin">25</integer>
-
-    <!-- Maximum strength, in percentage, supported by bright color reduction. -->
-    <integer name="config_reduceBrightColorsStrengthMax">50</integer>
-
    <!-- If this is true, the udfps vote is ignored. -->
    <bool name="config_ignoreUdfpsVote">true</bool>

--- a/husky/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -23,9 +23,6 @@
    <dimen name="rounded_corner_radius_top">91px</dimen>
    <dimen name="rounded_corner_radius_bottom">91px</dimen>

-    <!-- Default paddings for content around the corners. -->
-    <dimen name="rounded_corner_content_padding">16dp</dimen>
-
    <!-- Height of the status bar.
         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
         -->
--- a/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/husky/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -188,11 +188,11 @@
    </array>
    <item name="gps.voltage">3700</item>
    <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">38</item>
+    <item name="wifi.controller.idle">79</item>
    <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">57</item>
+    <item name="wifi.controller.rx">118</item>
    <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">550</item>
+    <item name="wifi.controller.tx">331</item>
    <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3850</item>
+    <item name="wifi.controller.voltage">3700</item>
 </device>
--- a/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/husky/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,18 +16,6 @@
 */
 -->
 <resources>
-    <!-- the padding on the start of the statusbar -->
-    <dimen name="status_bar_padding_start">0dp</dimen>
-
-    <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_default</dimen>
-
-    <!-- Margin on the left side of the carrier text on Keyguard -->
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-
-    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
-    <dimen name="ongoing_appops_dot_min_padding">16dp</dimen>
-
    <!-- Location on the screen of the center of the physical power button. -->
    <dimen name="physical_power_button_center_screen_location_y">774px</dimen>

--- a/husky/proprietary-files-carriersettings.txt
+++ b/husky/proprietary-files-carriersettings.txt
@@ -1,8 +1,6 @@
 # All blobs below are extracted from the release mentioned in proprietary-files.txt
 product/etc/CarrierSettings/1and1_de.pb
 product/etc/CarrierSettings/2degrees_nz.pb
-product/etc/CarrierSettings/321communications_us.pb
-product/etc/CarrierSettings/48_ie.pb
 product/etc/CarrierSettings/4ka_sk.pb
 product/etc/CarrierSettings/a1_at.pb
 product/etc/CarrierSettings/a1_bg.pb
@@ -10,13 +8,9 @@ product/etc/CarrierSettings/a1_hr.pb
 product/etc/CarrierSettings/a1_mk.pb
 product/etc/CarrierSettings/a1_si.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/altice_us.pb
-product/etc/CarrierSettings/alticeroaming_us.pb
 product/etc/CarrierSettings/andorratelecom_ad.pb
 product/etc/CarrierSettings/antel_uy.pb
 product/etc/CarrierSettings/appalachian_us.pb
@@ -24,14 +18,12 @@ product/etc/CarrierSettings/apt_tw.pb
 product/etc/CarrierSettings/asda_gb.pb
 product/etc/CarrierSettings/assurance_us.pb
 product/etc/CarrierSettings/astca_as.pb
-product/etc/CarrierSettings/astoundbroadband_us.pb
 product/etc/CarrierSettings/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_us.pb
-product/etc/CarrierSettings/axis_id.pb
 product/etc/CarrierSettings/base_be.pb
 product/etc/CarrierSettings/batelco_bh.pb
 product/etc/CarrierSettings/bell_ca.pb
@@ -57,11 +49,7 @@ product/etc/CarrierSettings/chatr_ca.pb
 product/etc/CarrierSettings/chinamobile_hk.pb
 product/etc/CarrierSettings/cht_tw.pb
 product/etc/CarrierSettings/cityfone_ca.pb
-product/etc/CarrierSettings/claro_br.pb
-product/etc/CarrierSettings/claro_cl.pb
-product/etc/CarrierSettings/claro_co.pb
 product/etc/CarrierSettings/claro_pr.pb
-product/etc/CarrierSettings/commonmvnxatt_us.pb
 product/etc/CarrierSettings/congstar_de.pb
 product/etc/CarrierSettings/consumercellularatt_us.pb
 product/etc/CarrierSettings/consumercellulartmo_us.pb
@@ -76,7 +64,6 @@ product/etc/CarrierSettings/cspire_us.pb
 product/etc/CarrierSettings/default.pb
 product/etc/CarrierSettings/digi_hu.pb
 product/etc/CarrierSettings/digi_my.pb
-product/etc/CarrierSettings/digi_pt.pb
 product/etc/CarrierSettings/digi_ro.pb
 product/etc/CarrierSettings/digimobil_es.pb
 product/etc/CarrierSettings/dish5gsa_us.pb
@@ -85,20 +72,15 @@ product/etc/CarrierSettings/dito_ph.pb
 product/etc/CarrierSettings/dna_fi.pb
 product/etc/CarrierSettings/docomo_jp.pb
 product/etc/CarrierSettings/docomomvno_jp.pb
-product/etc/CarrierSettings/docomopacific_us.pb
 product/etc/CarrierSettings/dtac_th.pb
 product/etc/CarrierSettings/du_ae.pb
 product/etc/CarrierSettings/eastlink_ca.pb
 product/etc/CarrierSettings/ee_gb.pb
-product/etc/CarrierSettings/eeyoumobility_ca.pb
 product/etc/CarrierSettings/eir_ie.pb
 product/etc/CarrierSettings/elisa1_fi.pb
 product/etc/CarrierSettings/elisa2_fi.pb
 product/etc/CarrierSettings/elisa_ee.pb
-product/etc/CarrierSettings/enetworks_gy.pb
 product/etc/CarrierSettings/enreach_nl.pb
-product/etc/CarrierSettings/entel_cl.pb
-product/etc/CarrierSettings/epic_mt.pb
 product/etc/CarrierSettings/eplus_de.pb
 product/etc/CarrierSettings/erate_no.pb
 product/etc/CarrierSettings/esn_gb.pb
@@ -108,7 +90,7 @@ product/etc/CarrierSettings/evolve_us.pb
 product/etc/CarrierSettings/fastweb_it.pb
 product/etc/CarrierSettings/fet_tw.pb
 product/etc/CarrierSettings/fi_at.pb
-product/etc/CarrierSettings/fi_tmo_us.pb
+product/etc/CarrierSettings/fi_us.pb
 product/etc/CarrierSettings/fido_ca.pb
 product/etc/CarrierSettings/finetwork_es.pb
 product/etc/CarrierSettings/firstnet_us.pb
@@ -116,10 +98,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/foroyatele_fo.pb
 product/etc/CarrierSettings/free_fr.pb
-product/etc/CarrierSettings/free_gp.pb
-product/etc/CarrierSettings/free_mq.pb
 product/etc/CarrierSettings/free_re.pb
 product/etc/CarrierSettings/freedommobile_ca.pb
 product/etc/CarrierSettings/gamma_gb.pb
@@ -128,8 +107,6 @@ product/etc/CarrierSettings/gibtel_gi.pb
 product/etc/CarrierSettings/giffgaff_gb.pb
 product/etc/CarrierSettings/giga_sg.pb
 product/etc/CarrierSettings/globe_ph.pb
-product/etc/CarrierSettings/gomobile_mt.pb
-product/etc/CarrierSettings/grameenphone_bd.pb
 product/etc/CarrierSettings/guuk_es.pb
 product/etc/CarrierSettings/h3_at.pb
 product/etc/CarrierSettings/h3_gb.pb
@@ -137,7 +114,6 @@ product/etc/CarrierSettings/h3_ie.pb
 product/etc/CarrierSettings/h3_se.pb
 product/etc/CarrierSettings/h3g27202_ie.pb
 product/etc/CarrierSettings/halebop_se.pb
-product/etc/CarrierSettings/helium_us.pb
 product/etc/CarrierSettings/help_at.pb
 product/etc/CarrierSettings/homobile_it.pb
 product/etc/CarrierSettings/hotmobile_il.pb
@@ -145,15 +121,9 @@ product/etc/CarrierSettings/ice_no.pb
 product/etc/CarrierSettings/idea_in.pb
 product/etc/CarrierSettings/idmobile_gb.pb
 product/etc/CarrierSettings/iliad_it.pb
-product/etc/CarrierSettings/indosat_id.pb
 product/etc/CarrierSettings/inland_us.pb
-product/etc/CarrierSettings/iwireless_us.pb
-product/etc/CarrierSettings/jazz_pk.pb
 product/etc/CarrierSettings/jazztel_es.pb
-product/etc/CarrierSettings/jcommobile_jp.pb
-product/etc/CarrierSettings/kddi5gsa_jp.pb
 product/etc/CarrierSettings/kddi_jp.pb
-product/etc/CarrierSettings/kddimvno5gsa_jp.pb
 product/etc/CarrierSettings/kddimvno_jp.pb
 product/etc/CarrierSettings/kena_it.pb
 product/etc/CarrierSettings/koodo_ca.pb
@@ -161,7 +131,6 @@ product/etc/CarrierSettings/kpn_nl.pb
 product/etc/CarrierSettings/lebara_es.pb
 product/etc/CarrierSettings/lebara_fr.pb
 product/etc/CarrierSettings/lebara_gb.pb
-product/etc/CarrierSettings/lebara_nl.pb
 product/etc/CarrierSettings/liberty_pr.pb
 product/etc/CarrierSettings/lifecell_ua.pb
 product/etc/CarrierSettings/linemo_jp.pb
@@ -171,33 +140,18 @@ product/etc/CarrierSettings/lowi_es.pb
 product/etc/CarrierSettings/luckymobile_ca.pb
 product/etc/CarrierSettings/lum_ca.pb
 product/etc/CarrierSettings/lyca_es.pb
-product/etc/CarrierSettings/lyca_us.pb
-product/etc/CarrierSettings/lycamobile_gb.pb
-product/etc/CarrierSettings/lycamobile_pt.pb
-product/etc/CarrierSettings/lycamobile_se.pb
 product/etc/CarrierSettings/m1_sg.pb
-product/etc/CarrierSettings/magticom_ge.pb
 product/etc/CarrierSettings/manxcontract_im.pb
 product/etc/CarrierSettings/manxprepaid_im.pb
 product/etc/CarrierSettings/masmovil_es.pb
 product/etc/CarrierSettings/maxis_my.pb
-product/etc/CarrierSettings/mediacom_us.pb
-product/etc/CarrierSettings/melita_mt.pb
 product/etc/CarrierSettings/meo_pt.pb
 product/etc/CarrierSettings/metropcs_us.pb
-product/etc/CarrierSettings/mobifone_vn.pb
 product/etc/CarrierSettings/mobily_sa.pb
 product/etc/CarrierSettings/monacotelecom_mc.pb
-product/etc/CarrierSettings/movistar_co.pb
 product/etc/CarrierSettings/movistar_es.pb
 product/etc/CarrierSettings/movistar_mx.pb
-product/etc/CarrierSettings/mucho_ch.pb
-product/etc/CarrierSettings/mvnoconnect_us.pb
-product/etc/CarrierSettings/nema_fo.pb
-product/etc/CarrierSettings/netcomgroup_fr.pb
-product/etc/CarrierSettings/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
@@ -208,12 +162,9 @@ product/etc/CarrierSettings/o2postpaid_gb.pb
 product/etc/CarrierSettings/o2prepaid_de.pb
 product/etc/CarrierSettings/o2prepaid_gb.pb
 product/etc/CarrierSettings/omantel_om.pb
-product/etc/CarrierSettings/one_me.pb
 product/etc/CarrierSettings/onecall_no.pb
-product/etc/CarrierSettings/only_yt.pb
 product/etc/CarrierSettings/ooredoo_kw.pb
 product/etc/CarrierSettings/ooredoo_qa.pb
-product/etc/CarrierSettings/optimera_us.pb
 product/etc/CarrierSettings/optus_au.pb
 product/etc/CarrierSettings/orange_be.pb
 product/etc/CarrierSettings/orange_es.pb
@@ -231,24 +182,18 @@ product/etc/CarrierSettings/pcmobilebell_ca.pb
 product/etc/CarrierSettings/pelephone_il.pb
 product/etc/CarrierSettings/pepephone_es.pb
 product/etc/CarrierSettings/play_pl.pb
-product/etc/CarrierSettings/plintron_us.pb
 product/etc/CarrierSettings/plus_pl.pb
 product/etc/CarrierSettings/post_lu.pb
-product/etc/CarrierSettings/postemobile_it.pb
-product/etc/CarrierSettings/povo5gsa_jp.pb
 product/etc/CarrierSettings/povo_jp.pb
 product/etc/CarrierSettings/proximus_be.pb
 product/etc/CarrierSettings/publicmobile_ca.pb
-product/etc/CarrierSettings/pwg_us.pb
-product/etc/CarrierSettings/qlink_us.pb
 product/etc/CarrierSettings/r_es.pb
 product/etc/CarrierSettings/racc_es.pb
 product/etc/CarrierSettings/rakuten_jp.pb
+product/etc/CarrierSettings/reachmobileatt_us.pb
 product/etc/CarrierSettings/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/rogers5g_ca.pb
 product/etc/CarrierSettings/rogers_ca.pb
 product/etc/CarrierSettings/rogerswpn_ca.pb
@@ -265,47 +210,34 @@ product/etc/CarrierSettings/singtel_sg.pb
 product/etc/CarrierSettings/skinny_nz.pb
 product/etc/CarrierSettings/skt_kr.pb
 product/etc/CarrierSettings/sky_gb.pb
-product/etc/CarrierSettings/sky_ie.pb
 product/etc/CarrierSettings/skylo_zz.pb
 product/etc/CarrierSettings/smart_ph.pb
-product/etc/CarrierSettings/smartfren_id.pb
 product/etc/CarrierSettings/smartone_hk.pb
 product/etc/CarrierSettings/smarty_gb.pb
 product/etc/CarrierSettings/softbank_jp.pb
 product/etc/CarrierSettings/solomobile_ca.pb
 product/etc/CarrierSettings/spark_nz.pb
 product/etc/CarrierSettings/spectrum_us.pb
-product/etc/CarrierSettings/spectrummso_us.pb
-product/etc/CarrierSettings/spectrummsotest_us.pb
 product/etc/CarrierSettings/spmtelecom_pm.pb
 product/etc/CarrierSettings/sprint_us.pb
 product/etc/CarrierSettings/sprintprepaid_us.pb
 product/etc/CarrierSettings/sprintwholesale_us.pb
 product/etc/CarrierSettings/spusu_at.pb
-product/etc/CarrierSettings/spusu_ch.pb
-product/etc/CarrierSettings/spusu_gb.pb
-product/etc/CarrierSettings/spusu_it.pb
-product/etc/CarrierSettings/ssimobile_ca.pb
 product/etc/CarrierSettings/starhub_sg.pb
 product/etc/CarrierSettings/stc_bh.pb
 product/etc/CarrierSettings/stc_kw.pb
 product/etc/CarrierSettings/stc_sa.pb
 product/etc/CarrierSettings/strata_us.pb
 product/etc/CarrierSettings/sunrise_ch.pb
-product/etc/CarrierSettings/superdrug_gb.pb
 product/etc/CarrierSettings/sweno_es.pb
 product/etc/CarrierSettings/swisscom_ch.pb
 product/etc/CarrierSettings/swisscom_li.pb
-product/etc/CarrierSettings/swisscommvno_ch.pb
 product/etc/CarrierSettings/talkmobile_gb.pb
 product/etc/CarrierSettings/tango_lu.pb
 product/etc/CarrierSettings/tango_us.pb
 product/etc/CarrierSettings/tbaytel_ca.pb
-product/etc/CarrierSettings/tchibo_at.pb
 product/etc/CarrierSettings/tchibo_de.pb
 product/etc/CarrierSettings/tdc_dk.pb
-product/etc/CarrierSettings/telavox_be.pb
-product/etc/CarrierSettings/telavox_se.pb
 product/etc/CarrierSettings/telcel_mx.pb
 product/etc/CarrierSettings/telco_re.pb
 product/etc/CarrierSettings/tele2_ee.pb
@@ -317,18 +249,15 @@ product/etc/CarrierSettings/telekom_de.pb
 product/etc/CarrierSettings/telekom_gr.pb
 product/etc/CarrierSettings/telekom_hr.pb
 product/etc/CarrierSettings/telekom_hu.pb
-product/etc/CarrierSettings/telekom_me.pb
 product/etc/CarrierSettings/telekom_mk.pb
 product/etc/CarrierSettings/telekom_pl.pb
 product/etc/CarrierSettings/telekom_ro.pb
 product/etc/CarrierSettings/telekom_si.pb
 product/etc/CarrierSettings/telekom_sk.pb
-product/etc/CarrierSettings/telemach_hr.pb
 product/etc/CarrierSettings/telemach_si.pb
 product/etc/CarrierSettings/telenet_be.pb
 product/etc/CarrierSettings/telenor_dk.pb
 product/etc/CarrierSettings/telenor_no.pb
-product/etc/CarrierSettings/telenor_pk.pb
 product/etc/CarrierSettings/telenor_se.pb
 product/etc/CarrierSettings/telia_dk.pb
 product/etc/CarrierSettings/telia_ee.pb
@@ -336,21 +265,15 @@ product/etc/CarrierSettings/telia_fi.pb
 product/etc/CarrierSettings/telia_lt.pb
 product/etc/CarrierSettings/telia_no.pb
 product/etc/CarrierSettings/telia_se.pb
-product/etc/CarrierSettings/telkomsel_id.pb
-product/etc/CarrierSettings/tello_us.pb
 product/etc/CarrierSettings/telstra_au.pb
 product/etc/CarrierSettings/telus_ca.pb
 product/etc/CarrierSettings/tesco_gb.pb
-product/etc/CarrierSettings/test001_zz.pb
 product/etc/CarrierSettings/three_dk.pb
-product/etc/CarrierSettings/tigo_co.pb
-product/etc/CarrierSettings/tim_br.pb
 product/etc/CarrierSettings/tim_it.pb
 product/etc/CarrierSettings/tmobile_at.pb
 product/etc/CarrierSettings/tmobile_cz.pb
 product/etc/CarrierSettings/tmobile_nl.pb
 product/etc/CarrierSettings/tmobile_us.pb
-product/etc/CarrierSettings/tmobileprivate_us.pb
 product/etc/CarrierSettings/tmomvno_nl.pb
 product/etc/CarrierSettings/tmomvno_us.pb
 product/etc/CarrierSettings/tracfoneatt_us.pb
@@ -372,7 +295,6 @@ product/etc/CarrierSettings/ultra_us.pb
 product/etc/CarrierSettings/umobile_my.pb
 product/etc/CarrierSettings/unifi_my.pb
 product/etc/CarrierSettings/unionwireless_us.pb
-product/etc/CarrierSettings/unitedwireless_us.pb
 product/etc/CarrierSettings/uqmobile5gsa_jp.pb
 product/etc/CarrierSettings/uqmobile_jp.pb
 product/etc/CarrierSettings/uscc_us.pb
@@ -380,7 +302,6 @@ product/etc/CarrierSettings/verizon_us.pb
 product/etc/CarrierSettings/verymobile_it.pb
 product/etc/CarrierSettings/viaero_us.pb
 product/etc/CarrierSettings/videotron_ca.pb
-product/etc/CarrierSettings/viettel_vn.pb
 product/etc/CarrierSettings/vimla_se.pb
 product/etc/CarrierSettings/vinaphone_vn.pb
 product/etc/CarrierSettings/virgin_ca.pb
@@ -390,8 +311,6 @@ product/etc/CarrierSettings/virgintelco_es.pb
 product/etc/CarrierSettings/visible_us.pb
 product/etc/CarrierSettings/visiblev_us.pb
 product/etc/CarrierSettings/viti_pf.pb
-product/etc/CarrierSettings/vivacom_bg.pb
-product/etc/CarrierSettings/vivo_br.pb
 product/etc/CarrierSettings/vodafone_au.pb
 product/etc/CarrierSettings/vodafone_cz.pb
 product/etc/CarrierSettings/vodafone_de.pb
@@ -401,7 +320,6 @@ product/etc/CarrierSettings/vodafone_gr.pb
 product/etc/CarrierSettings/vodafone_hu.pb
 product/etc/CarrierSettings/vodafone_ie.pb
 product/etc/CarrierSettings/vodafone_in.pb
-product/etc/CarrierSettings/vodafone_is.pb
 product/etc/CarrierSettings/vodafone_it.pb
 product/etc/CarrierSettings/vodafone_nl.pb
 product/etc/CarrierSettings/vodafone_nz.pb
@@ -410,12 +328,10 @@ product/etc/CarrierSettings/vodafone_pt.pb
 product/etc/CarrierSettings/vodafone_qa.pb
 product/etc/CarrierSettings/vodafone_ro.pb
 product/etc/CarrierSettings/vodafone_tr.pb
-product/etc/CarrierSettings/walmart_mx.pb
 product/etc/CarrierSettings/webbing_hk.pb
 product/etc/CarrierSettings/windtre_it.pb
 product/etc/CarrierSettings/xfinity2_us.pb
 product/etc/CarrierSettings/xfinity_us.pb
-product/etc/CarrierSettings/xfinitymso_us.pb
 product/etc/CarrierSettings/yes_my.pb
 product/etc/CarrierSettings/yesss_at.pb
 product/etc/CarrierSettings/yettel_bg.pb
@@ -425,4 +341,3 @@ product/etc/CarrierSettings/zain_bh.pb
 product/etc/CarrierSettings/zain_kw.pb
 product/etc/CarrierSettings/zain_sa.pb
 product/etc/CarrierSettings/zeop_re.pb
-product/etc/CarrierSettings/ztar_us.pb
--- a/husky/proprietary-files-vendor.txt
+++ b/husky/proprietary-files-vendor.txt
--- a/husky/proprietary-files.txt
+++ b/husky/proprietary-files.txt
@@ -4,8 +4,8 @@

 # AiAi
 product/priv-app/AICorePrebuilt/AICorePrebuilt.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/DevicePersonalizationPrebuiltPixel2023-U.32_V.7_playstore_aiai_20240725.00_RC08/DevicePersonalizationPrebuiltPixel2023-U.32_V.7_playstore_aiai_20240725.00_RC08.apk;PRESIGNED
+product/priv-app/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore/DeviceIntelligenceNetworkPrebuilt-v.U.14.playstore.apk;PRESIGNED
+product/priv-app/DevicePersonalizationPrebuiltPixel2023-v.U.14.playstore/DevicePersonalizationPrebuiltPixel2023-v.U.14.playstore.apk;PRESIGNED

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

-# Camera services
-product/etc/permissions/com.google.pixel.camera.connectivity.impl.xml
-product/etc/permissions/com.google.pixel.camera.services.cameraidremapper.impl.xml
-product/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.impl.xml
-
 # Felica
 product/etc/felica/common.cfg
 product/etc/felica/mfm.cfg
@@ -67,7 +62,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_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED
 product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED
 product/priv-app/ConnMO/ConnMO.apk
 product/priv-app/DCMO/DCMO.apk
@@ -92,33 +87,14 @@ 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
-system_ext/bin/hw/vendor.google.whitechapel.audio.hal.parserservice
-system_ext/etc/init/vendor.google.whitechapel.audio.hal.parserservice.rc
-
 # Camera extensions
 system_ext/etc/permissions/com.google.android.camera.extensions.xml
 system_ext/etc/permissions/com.google.android.camerax.extensions.xml
 system_ext/framework/com.google.android.camera.extensions.jar
 system_ext/framework/com.google.android.camerax.extensions.jar

-# Camera services
-system_ext/app/PersistentBackgroundCameraServices/PersistentBackgroundCameraServices.apk
-system_ext/etc/permissions/com.google.pixel.camera.connectivity.xml
-system_ext/etc/permissions/com.google.pixel.camera.services.cameraidremapper.xml
-system_ext/etc/permissions/com.google.pixel.camera.services.lyricconfigprovider.xml
-system_ext/etc/vintf/manifest/com.google.pixel.camera.services@1.0-service-google.xml
-system_ext/framework/com.google.pixel.camera.connectivity.jar
-system_ext/framework/com.google.pixel.camera.services.cameraidremapper.jar
-system_ext/framework/com.google.pixel.camera.services.lyricconfigprovider.jar
-
 # Display
 system_ext/lib64/libpixeldisplaymanager_jni.so;SYMLINK=system_ext/priv-app/PixelDisplayService/lib/arm64/libpixeldisplaymanager_jni.so
 system_ext/priv-app/PixelDisplayService/PixelDisplayService.apk
@@ -128,8 +104,9 @@ system_ext/bin/hw/vendor.google.edgetpu_app_service@1.0-service
 system_ext/etc/init/vendor.google.edgetpu_app_service@1.0-service.rc
 system_ext/etc/public.libraries-google.txt
 system_ext/etc/vintf/manifest/vendor.google.edgetpu_app_service@1.0-service.xml
-system_ext/lib64/com.google.edgetpu_app_service-V4-ndk.so
+system_ext/lib64/com.google.edgetpu_app_service-V3-ndk.so
 system_ext/lib64/com.google.edgetpu_vendor_service-V2-ndk.so
+system_ext/lib64/libedgetpu_dba.google.so

 # Hotword
 system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
@@ -140,19 +117,10 @@ system_ext/etc/permissions/com.android.qns.xml
 system_ext/etc/permissions/com.shannon.imsservice.xml
 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/priv-app/PixelImsMediaService/PixelImsMediaService.apk
 system_ext/priv-app/PixelQualifiedNetworksService/PixelQualifiedNetworksService.apk
 system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED
 system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED

-# IWLAN
-system_ext/etc/permissions/privapp-permlist_com.google.pixel.iwlan.xml
-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-evolution.xml

@@ -169,7 +137,6 @@ system_ext/priv-app/CarrierSetup/CarrierSetup.apk;PRESIGNED
 system_ext/priv-app/ConnectivityThermalPowerManager/ConnectivityThermalPowerManager.apk
 system_ext/priv-app/EuiccGoogleOverlay/EuiccGoogleOverlay.apk
 system_ext/priv-app/EuiccSupportPixel-P23/EuiccSupportPixel-P23.apk;PRESIGNED
-system_ext/priv-app/EuiccSupportPixel-P23/SUSA_RC2_23.up
 system_ext/priv-app/EuiccSupportPixel-P23/esim-full-v1-m40.img
 system_ext/priv-app/EuiccSupportPixel-P23/esim-full-v1-m41.img
 system_ext/priv-app/EuiccSupportPixel-P23/esim-full-v1.img
--- a/husky/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/husky/rro_overlays/NfcOverlay/res/values/config.xml
@@ -30,7 +30,7 @@
    <item>37</item>
  </integer-array>
  <integer-array name="antenna_y">
-    <item>55</item>
+    <item>103</item>
  </integer-array>
  <bool name="nfc_observe_mode_supported">true</bool>
 </resources>
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/Android.bp
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/Android.bp
@@ -1,9 +0,0 @@
-//
-// Copyright (C) 2024 The Android Open Source Project
-// SPDX-License-Identifier: Apache-2.0
-//
-
-runtime_resource_overlay {
-    name: "PixelDisplayServiceOverlayHusky",
-    product_specific: true,
-}
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/AndroidManifest.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The Android Open Source Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.pixeldisplayservice.overlay.husky">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="1"
-        android:targetPackage="com.android.pixeldisplayservice" />
-</manifest>
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9595.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_0_ZA9595.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7824.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_10_ZA7824.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7638.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_11_ZA7638.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7452.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_12_ZA7452.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_13_ZA7359.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_13_ZA7359.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_14_ZA7266.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_14_ZA7266.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_15_ZA7079.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_15_ZA7079.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_16_ZA6893.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_16_ZA6893.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_17_ZA6800.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_17_ZA6800.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA9314.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_1_ZA9314.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA9128.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_2_ZA9128.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8941.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_3_ZA8941.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8755.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_4_ZA8755.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8476.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_5_ZA8476.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8383.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_6_ZA8383.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8197.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_7_ZA8197.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA8103.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_8_ZA8103.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA8010.png
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/drawable/ZACI_9_ZA8010.png
--- a/husky/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
+++ b/husky/rro_overlays/PixelDisplayServiceOverlay/res/values/config.xml
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2024 The Android Open Source Project
-     SPDX-License-Identifier: Apache-2.0
-->
-<resources>
-    <array name="config_za_compensation_brightness_thresholds_list">
-        <item>@array/config_za_primary_display_brightness_thresholds_list</item>
-    </array>
-    <array name="config_za_compensation_images_list">
-        <item>@array/config_za_primary_display_compensation_images_list</item>
-    </array>
-    <array name="config_za_compensation_opr_thresholds">
-        <item>0.17</item>
-        <item>0.4</item>
-    </array>
-    <array name="config_za_primary_display_brightness_thresholds_list">
-        <item>@array/config_za_primary_display_condition1_brightness_thresholds</item>
-        <item>@array/config_za_primary_display_condition2_brightness_thresholds</item>
-    </array>
-    <array name="config_za_primary_display_compensation_images_list">
-        <item>@array/config_za_primary_display_condition1_compensation_images</item>
-        <item>@array/config_za_primary_display_condition2_compensation_images</item>
-    </array>
-    <array name="config_za_primary_display_condition1_brightness_thresholds">
-        <item>0.53125</item>
-        <item>0.546875</item>
-        <item>0.5625</item>
-        <item>0.578125</item>
-        <item>0.59375</item>
-        <item>0.671875</item>
-        <item>0.75</item>
-        <item>0.8125</item>
-        <item>0.875</item>
-        <item>0.9375</item>
-        <item>1.0</item>
-    </array>
-    <array name="config_za_primary_display_condition1_compensation_images">
-        <item>@drawable/ZACI_2_ZA9128</item>
-        <item>@drawable/ZACI_3_ZA8941</item>
-        <item>@drawable/ZACI_4_ZA8755</item>
-        <item>@drawable/ZACI_5_ZA8476</item>
-        <item>@drawable/ZACI_7_ZA8197</item>
-        <item>@drawable/ZACI_9_ZA8010</item>
-        <item>@drawable/ZACI_10_ZA7824</item>
-        <item>@drawable/ZACI_11_ZA7638</item>
-        <item>@drawable/ZACI_13_ZA7359</item>
-        <item>@drawable/ZACI_15_ZA7079</item>
-        <item>@drawable/ZACI_17_ZA6800</item>
-    </array>
-    <array name="config_za_primary_display_condition2_brightness_thresholds">
-        <item>0.53125</item>
-        <item>0.578125</item>
-        <item>0.625</item>
-        <item>0.65625</item>
-        <item>0.6875</item>
-        <item>0.71875</item>
-        <item>0.75</item>
-        <item>0.8125</item>
-        <item>0.828125</item>
-        <item>0.84375</item>
-        <item>0.859375</item>
-        <item>0.875</item>
-        <item>0.890625</item>
-        <item>0.90625</item>
-        <item>0.921875</item>
-        <item>0.9375</item>
-        <item>0.96875</item>
-        <item>1.0</item>
-    </array>
-    <array name="config_za_primary_display_condition2_compensation_images">
-        <item>@drawable/ZACI_0_ZA9595</item>
-        <item>@drawable/ZACI_1_ZA9314</item>
-        <item>@drawable/ZACI_2_ZA9128</item>
-        <item>@drawable/ZACI_3_ZA8941</item>
-        <item>@drawable/ZACI_4_ZA8755</item>
-        <item>@drawable/ZACI_5_ZA8476</item>
-        <item>@drawable/ZACI_6_ZA8383</item>
-        <item>@drawable/ZACI_7_ZA8197</item>
-        <item>@drawable/ZACI_8_ZA8103</item>
-        <item>@drawable/ZACI_9_ZA8010</item>
-        <item>@drawable/ZACI_10_ZA7824</item>
-        <item>@drawable/ZACI_11_ZA7638</item>
-        <item>@drawable/ZACI_12_ZA7452</item>
-        <item>@drawable/ZACI_13_ZA7359</item>
-        <item>@drawable/ZACI_14_ZA7266</item>
-        <item>@drawable/ZACI_15_ZA7079</item>
-        <item>@drawable/ZACI_16_ZA6893</item>
-        <item>@drawable/ZACI_17_ZA6800</item>
-    </array>
-    <bool name="config_compensation_animation_enabled">true</bool>
-    <item type="dimen" name="config_compensation_filter_intercept">10.0</item>
-    <item type="dimen" name="config_za_compensation_brightness_enter_threshold">0.5</item>
-    <integer name="config_ambient_brightness_changed_debounce_ms">500</integer>
-    <integer name="config_compensation_filter_horizon">1500</integer>
-</resources>
--- a/husky/rro_overlays/UwbOverlay/res/values/config.xml
+++ b/husky/rro_overlays/UwbOverlay/res/values/config.xml
@@ -30,12 +30,4 @@
       * When previously foreground 3p apps moves to background, sessions are not terminated
    -->
    <bool name = "background_ranging_enabled">true</bool>
-
-    <!-- Whether multicast list update notification v2 is supported or not.
-     If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
-    <bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
-
-    <!-- Whether multicast list update response v2 is supported or not.
-     If enabled, the response will be parsed into version 2 if uci major version is 2.0. -->
-    <bool name = "is_multicast_list_update_rsp_v2_supported">true</bool>
 </resources>
--- a/husky/setup-makefiles.py
+++ b/husky/setup-makefiles.py
@@ -1 +0,0 @@
-#!./extract-files.py --regenerate_makefiles
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`#!./extract-files.py --regenerate_makefiles`