From 6870e5c16b24813e6a40078cc60777faed2ebae5 Mon Sep 17 00:00:00 2001
From: Łukasz Rymanowski <rlukasz@google.com>
Date: Mon, 17 Mar 2025 17:12:52 +0000
Subject: 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
---
 flags/leaudio.aconfig                     | 10 ----------
 system/bta/le_audio/codec_manager.cc      |  7 ++-----
 system/bta/le_audio/codec_manager_test.cc |  4 ----
 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
@@ -50,16 +50,6 @@ flag {
     bug: "328471369"
 }
 
-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
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);
-- 
cgit v1.2.3-59-g8ed1b