commit a095995963e3b894e8d5e56b1a1eda47657693c2
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 31 22:09:37 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri May 31 22:09:37 2024 +0000
tree 98ed007b3272e7a3a89093c190ae59c05b700c88
parent 7d8b140cc233a0770dc7575f05f025b3b772f467
parent daea5cd2facaa5fa83a339cb8751f8cfdc8a1556

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27512346'] into 24Q3-release.

Change-Id: I070373deef480208d1b442fa0e1b3a169904f853

audio/oriole/tuning/waves/waves_config.ini

diff --git a/audio/oriole/tuning/waves/waves_config.ini b/audio/oriole/tuning/waves/waves_config.ini
index ba12a8e..f330db0 100644
--- a/audio/oriole/tuning/waves/waves_config.ini
+++ b/audio/oriole/tuning/waves/waves_config.ini
@@ -29,7 +29,6 @@
 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
-HEADSET_MUSIC = OM:2,SM:2
 
 ########################################################################################################
 # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -38,8 +37,6 @@
 ########################################################################################################
 [HAL_SUPPORTED_CONTROLS]
 SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
-A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
 
 [COEFS_CONVERTER_SETTING]
 AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so

audio/raven/tuning/waves/waves_config.ini

diff --git a/audio/raven/tuning/waves/waves_config.ini b/audio/raven/tuning/waves/waves_config.ini
index ba12a8e..f330db0 100644
--- a/audio/raven/tuning/waves/waves_config.ini
+++ b/audio/raven/tuning/waves/waves_config.ini
@@ -29,7 +29,6 @@
 SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
 SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
-HEADSET_MUSIC = OM:2,SM:2
 
 ########################################################################################################
 # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@@ -38,8 +37,6 @@
 ########################################################################################################
 [HAL_SUPPORTED_CONTROLS]
 SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL
-A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
-USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
 
 [COEFS_CONVERTER_SETTING]
 AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so