2 files changed, 10 insertions, 17 deletions
diff --git a/system/bta/le_audio/device_groups.cc b/system/bta/le_audio/device_groups.cc
index 43f27c0a31..6b1f98a6f8 100644
--- a/system/bta/le_audio/device_groups.cc
+++ b/system/bta/le_audio/device_groups.cc
@@ -862,8 +862,7 @@ LeAudioDeviceGroup::GetAudioSetConfigurationRequirements(types::LeAudioContextTy
         continue;
       }
 
-      if ((com::android::bluetooth::flags::le_audio_support_unidirectional_voice_assistant() &&
-           ctx_type == types::LeAudioContextType::VOICEASSISTANTS) ||
+      if (ctx_type == types::LeAudioContextType::VOICEASSISTANTS ||
           ctx_type == types::LeAudioContextType::GAME) {
         // For GAME and VOICE ASSISTANT, ignore direction if it is not supported only on a single
         // direction.
@@ -1689,19 +1688,16 @@ bool LeAudioDeviceGroup::IsAudioSetConfigurationSupported(
       continue;
     }
 
-    if (com::android::bluetooth::flags::le_audio_support_unidirectional_voice_assistant()) {
-      // Verify the direction requirements.
-      if (direction == types::kLeAudioDirectionSink &&
-          requirements.sink_requirements->size() == 0) {
-        log::debug("There is no requirement for Sink direction.");
-        return false;
-      }
+    // Verify the direction requirements.
+    if (direction == types::kLeAudioDirectionSink && requirements.sink_requirements->size() == 0) {
+      log::debug("There is no requirement for Sink direction.");
+      return false;
+    }
 
-      if (direction == types::kLeAudioDirectionSource &&
-          requirements.source_requirements->size() == 0) {
-        log::debug("There is no requirement for source direction.");
-        return false;
-      }
+    if (direction == types::kLeAudioDirectionSource &&
+        requirements.source_requirements->size() == 0) {
+      log::debug("There is no requirement for source direction.");
+      return false;
     }
 
     // Match with requirement first if we have
diff --git a/system/bta/le_audio/le_audio_client_test.cc b/system/bta/le_audio/le_audio_client_test.cc
index a27c272872..5b72088f3d 100644
--- a/system/bta/le_audio/le_audio_client_test.cc
+++ b/system/bta/le_audio/le_audio_client_test.cc
@@ -6577,7 +6577,6 @@ TEST_F(UnicastTest, SpeakerStreamingNonDefault) {
 }
 
 TEST_F(UnicastTest, TestUnidirectionalGameAndLiveRecording) {
-  com::android::bluetooth::flags::provider_->le_audio_support_unidirectional_voice_assistant(true);
   const RawAddress test_address0 = GetTestAddress(0);
   int group_id = bluetooth::groups::kGroupUnknown;
 
@@ -6768,7 +6767,6 @@ TEST_F(UnicastTest, TestUnidirectionalGameAndLiveRecordingMicOnlyDev) {
 }
 
 TEST_F(UnicastTest, TestUnidirectionalVoiceAssistant_Sink) {
-  com::android::bluetooth::flags::provider_->le_audio_support_unidirectional_voice_assistant(true);
   const RawAddress test_address0 = GetTestAddress(0);
   int group_id = bluetooth::groups::kGroupUnknown;
 
@@ -6842,7 +6840,6 @@ TEST_F(UnicastTest, TestUnidirectionalVoiceAssistant_Sink) {
 }
 
 TEST_F(UnicastTest, TestUnidirectionalVoiceAssistant_Source) {
-  com::android::bluetooth::flags::provider_->le_audio_support_unidirectional_voice_assistant(true);
   const RawAddress test_address0 = GetTestAddress(0);
   int group_id = bluetooth::groups::kGroupUnknown;