flag: Remove leaudio_codec_config_callback_order_fix flag

Flag has been delivered

Bug: 326442537
Test: mmm packages/modules/Bluetooth
Flag: EXEMPT, flag cleanup

Change-Id: I9c28b4374fd6101b44c32f855c6d1fa04be54bd5

5 files changed, 4 insertions, 27 deletions

diff --git a/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java b/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
index 4f0d215e5b..3576d07c3c 100644
--- a/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
+++ b/android/app/src/com/android/bluetooth/le_audio/LeAudioService.java
@@ -3371,11 +3371,6 @@ public class LeAudioService extends ProfileService {
             boolean inputCodecOrFreqChanged) {
         Log.i(TAG, "notifyAudioFrameworkForCodecConfigUpdate groupId: " + groupId);
 
-        if (!Flags.leaudioCodecConfigCallbackOrderFix()) {
-            Log.d(TAG, "leaudio_codec_config_callback_order_fix is not enabled");
-            return;
-        }
-
         if (mActiveAudioOutDevice != null && outputCodecOrFreqChanged) {
             int volume = getAudioDeviceGroupVolume(groupId);
 
diff --git a/android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java b/android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java
index cf836ddc3c..77f42a6100 100644
--- a/android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java
+++ b/android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java
@@ -210,7 +210,6 @@ public class LeAudioServiceTest {
     public static List<FlagsParameterization> getParams() {
         return FlagsParameterization.progressionOf(
                 Flags.FLAG_LEAUDIO_BROADCAST_PRIMARY_GROUP_SELECTION,
-                Flags.FLAG_LEAUDIO_CODEC_CONFIG_CALLBACK_ORDER_FIX,
                 Flags.FLAG_LEAUDIO_UNICAST_NO_AVAILABLE_CONTEXTS,
                 Flags.FLAG_LEAUDIO_BROADCAST_API_MANAGE_PRIMARY_GROUP,
                 Flags.FLAG_DO_NOT_HARDCODE_TMAP_ROLE_MASK);
@@ -1842,7 +1841,6 @@ public class LeAudioServiceTest {
 
     /** Test native interface group status message handling */
     @Test
-    @EnableFlags(Flags.FLAG_LEAUDIO_CODEC_CONFIG_CALLBACK_ORDER_FIX)
     public void testMessageFromNativeGroupCodecConfigChangedNonActiveDevice() {
         onGroupCodecConfChangedCallbackCalled = false;
 
@@ -1928,7 +1926,6 @@ public class LeAudioServiceTest {
 
     /** Test native interface group status message handling */
     @Test
-    @EnableFlags(Flags.FLAG_LEAUDIO_CODEC_CONFIG_CALLBACK_ORDER_FIX)
     public void testMessageFromNativeGroupCodecConfigChangedActiveDevice_DifferentConfiguration() {
         onGroupCodecConfChangedCallbackCalled = false;
 
diff --git a/flags/leaudio.aconfig b/flags/leaudio.aconfig
index c475373093..bc9210e9b4 100644
--- a/flags/leaudio.aconfig
+++ b/flags/leaudio.aconfig
@@ -44,16 +44,6 @@ flag {
 }
 
 flag {
-    name: "leaudio_codec_config_callback_order_fix"
-    namespace: "bluetooth"
-    description: "Fix for the order on the callback"
-    bug: "326442537"
-    metadata {
-        purpose: PURPOSE_BUGFIX
-    }
-}
-
-flag {
     name: "leaudio_allow_leaudio_only_devices"
     namespace: "bluetooth"
     description: "Enable Le Audio for LeAudio only devices"
diff --git a/system/bta/le_audio/client.cc b/system/bta/le_audio/client.cc
index e03c456b84..388070ef8a 100644
--- a/system/bta/le_audio/client.cc
+++ b/system/bta/le_audio/client.cc
@@ -1789,14 +1789,10 @@ public:
     /* Reset sink and source listener notified status */
     sink_monitor_notified_status_ = std::nullopt;
     source_monitor_notified_status_ = std::nullopt;
-    if (com::android::bluetooth::flags::leaudio_codec_config_callback_order_fix()) {
-      SendAudioGroupSelectableCodecConfigChanged(group);
-      SendAudioGroupCurrentCodecConfigChanged(group);
-      callbacks_->OnGroupStatus(active_group_id_, GroupStatus::ACTIVE);
-    } else {
-      callbacks_->OnGroupStatus(active_group_id_, GroupStatus::ACTIVE);
-      SendAudioGroupSelectableCodecConfigChanged(group);
-    }
+
+    SendAudioGroupSelectableCodecConfigChanged(group);
+    SendAudioGroupCurrentCodecConfigChanged(group);
+    callbacks_->OnGroupStatus(active_group_id_, GroupStatus::ACTIVE);
   }
 
   void SetEnableState(const RawAddress& address, bool enabled) override {
diff --git a/system/bta/le_audio/le_audio_client_test.cc b/system/bta/le_audio/le_audio_client_test.cc
index 10e2f2b561..a27c272872 100644
--- a/system/bta/le_audio/le_audio_client_test.cc
+++ b/system/bta/le_audio/le_audio_client_test.cc
@@ -4792,7 +4792,6 @@ TEST_F(UnicastTest, GroupSetActiveNonConnectedGroup) {
 }
 
 TEST_F(UnicastTest, GroupSetActive_CurrentCodecSentOfActive) {
-  com::android::bluetooth::flags::provider_->leaudio_codec_config_callback_order_fix(true);
   const RawAddress test_address0 = GetTestAddress(0);
   int group_id = bluetooth::groups::kGroupUnknown;