Snap for 11591048 from 436806e064 to 24Q3-release

Change-Id: I9ca07d70a8925b2edc22712961c3fc2874e22848

audio/caiman/audio-tables.mk

@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

audio/caiman/tuning/Android.bp

@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     soc_specific: true,
 }
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
+    src: "spatializer/base",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
+    src: "spatializer/mode_2_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
+    src: "spatializer/mode_6_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
+    src: "spatializer/mode_xaural",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}

audio/komodo/audio-tables.mk

@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

audio/komodo/tuning/Android.bp

@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     soc_specific: true,
 }
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
+    src: "spatializer/base",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
+    src: "spatializer/mode_2_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
+    src: "spatializer/mode_6_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
+    src: "spatializer/mode_xaural",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}

audio/tokay/audio-tables.mk

@@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
     device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
 
 endif
+
+# Offload spatializer config
+PRODUCT_PACKAGES += \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.base \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
+    vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

audio/tokay/tuning/Android.bp

@@ -128,3 +128,35 @@ prebuilt_etc {
     src: "waves/tests/test_preset.mps",
     soc_specific: true,
 }
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
+    src: "spatializer/base",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
+    src: "spatializer/mode_2_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
+    src: "spatializer/mode_6_ch",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}
+
+prebuilt_etc {
+    name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
+    src: "spatializer/mode_xaural",
+    soc_specific: true,
+    filename_from_src: true,
+    relative_install_path: "spatializer",
+}

bluetooth/bt_vendor_overlay_caiman.conf

@@ -30,3 +30,5 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 BtOpusEnabled = true
 
 AccelBtDisable = false
+
+BtHalRecoveryByRestart = true

bluetooth/bt_vendor_overlay_komodo.conf

@@ -30,3 +30,5 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 BtOpusEnabled = true
 
 AccelBtDisable = false
+
+BtHalRecoveryByRestart = true

bluetooth/bt_vendor_overlay_tokay.conf

@@ -30,3 +30,5 @@ BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus
 BtOpusEnabled = true
 
 AccelBtDisable = false
+
+BtHalRecoveryByRestart = true

device-caiman.mk

@@ -279,6 +279,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
+# OIS with system imu
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.ois_with_system_imu=true
+
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true

device-komodo.mk

@@ -298,6 +298,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
+# OIS with system imu
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.ois_with_system_imu=true
+
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true

device-tokay.mk

@@ -268,6 +268,10 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.als_feed_forward_supported=true \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
+# OIS with system imu
+PRODUCT_VENDOR_PROPERTIES += \
+    persist.vendor.camera.ois_with_system_imu=true
+
 # Camera Vendor property
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.front_720P_always_binning=true