summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Łukasz Rymanowski <rlukasz@google.com> 2025-03-17 17:12:52 +0000
committer Łukasz Rymanowski (xWF) <rlukasz@google.com> 2025-03-20 02:32:42 -0700
commit6870e5c16b24813e6a40078cc60777faed2ebae5 (patch)
tree4c02b19ae3b0690692968c6928d05f62db55b7be
parent4356efed58e6b510fe73063016d57291f38ebe93 (diff)
flag: Remove leaudio_mono_location_errata flag
Flag has been delivered Bug: 331139722 Test: mmm packages/modules/Bluetooth Flag: EXEMPT, flag cleanup Change-Id: I0a52adef9694ca6b852f52621583840252f7fb2c
-rw-r--r--flags/leaudio.aconfig10
-rw-r--r--system/bta/le_audio/codec_manager.cc7
-rw-r--r--system/bta/le_audio/codec_manager_test.cc4
3 files changed, 2 insertions, 19 deletions
diff --git a/flags/leaudio.aconfig b/flags/leaudio.aconfig
index ad06ad64a1..7a917fbaca 100644
--- a/flags/leaudio.aconfig
+++ b/flags/leaudio.aconfig
@@ -51,16 +51,6 @@ flag {
}
flag {
- name: "leaudio_mono_location_errata"
- namespace: "bluetooth"
- description: "Add mono location as per Bluetooth Assigned Numbers"
- bug: "331139722"
- metadata {
- purpose: PURPOSE_BUGFIX
- }
-}
-
-flag {
name: "leaudio_mono_location_errata_api"
is_exported: true
namespace: "bluetooth"
diff --git a/system/bta/le_audio/codec_manager.cc b/system/bta/le_audio/codec_manager.cc
index 104d397833..03ea6eede7 100644
--- a/system/bta/le_audio/codec_manager.cc
+++ b/system/bta/le_audio/codec_manager.cc
@@ -787,11 +787,8 @@ public:
bool UpdateCisMonoConfiguration(const std::vector<struct types::cis>& cises,
const stream_parameters& stream_params, uint8_t direction) {
- if (!LeAudioHalVerifier::SupportsStreamActiveApi() ||
- !com::android::bluetooth::flags::leaudio_mono_location_errata()) {
- log::error(
- "SupportsStreamActiveApi() not supported or leaudio_mono_location_errata flag is not "
- "enabled. Mono stream cannot be enabled");
+ if (!LeAudioHalVerifier::SupportsStreamActiveApi()) {
+ log::error("SupportsStreamActiveApi() not supported. Mono stream cannot be enabled");
return false;
}
diff --git a/system/bta/le_audio/codec_manager_test.cc b/system/bta/le_audio/codec_manager_test.cc
index c69464b72e..f238b959f8 100644
--- a/system/bta/le_audio/codec_manager_test.cc
+++ b/system/bta/le_audio/codec_manager_test.cc
@@ -369,8 +369,6 @@ public:
// Disable codec extensibility by default
osi_property_set_bool(kPropLeAudioCodecExtensibility, false);
- com::android::bluetooth::flags::provider_->leaudio_mono_location_errata(false);
-
CodecManagerTestBase::SetUp();
}
};
@@ -542,7 +540,6 @@ TEST_F(CodecManagerTestAdsp, testStreamConfigurationAdspDownMix) {
}
TEST_F(CodecManagerTestAdsp, testStreamConfigurationMono) {
- com::android::bluetooth::flags::provider_->leaudio_mono_location_errata(true);
const std::vector<bluetooth::le_audio::btle_audio_codec_config_t> offloading_preference(0);
codec_manager->Start(offloading_preference);
@@ -1343,7 +1340,6 @@ TEST_F(CodecManagerTestHost, test_dont_call_hal_for_config) {
}
TEST_F(CodecManagerTestAdsp, testStreamConfigurationVendor) {
- com::android::bluetooth::flags::provider_->leaudio_mono_location_errata(true);
osi_property_set_bool(kPropLeAudioCodecExtensibility, true);
const std::vector<bluetooth::le_audio::btle_audio_codec_config_t> offloading_preference(0);