From fc5b76899c464056dc52b5d1273fdfba7b95b34b Mon Sep 17 00:00:00 2001 From: Ɓukasz Rymanowski Date: Mon, 17 Mar 2025 13:45:08 +0000 Subject: 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 --- system/bta/le_audio/client.cc | 12 ++++-------- system/bta/le_audio/le_audio_client_test.cc | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'system') 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; -- cgit v1.2.3-59-g8ed1b