Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 537d46a2 authored by Rongxuan Liu's avatar Rongxuan Liu Committed by Automerger Merge Worker
Browse files

Merge "Remove released flag leaudio_enable_health_based_actions from test... 

Merge "Remove released flag leaudio_enable_health_based_actions from test file" into main am: 11ff224d am: 0db28216

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3142220



Change-Id: I5f370c8cef9f3f4358f7a7ac70b9f34ecc9637d0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebd2c769 0db28216

system/bta/le_audio/le_audio_client_test.cc

+1 −15
Original line number Diff line number Diff line
@@ -101,15 +101,6 @@ static constexpr char kNotifyUpperLayerAboutGroupBeingInIdleDuringCall[] = 
const char* test_flags[] = {

    "INIT_default_log_level_str=LOG_VERBOSE",

    "INIT_leaudio_targeted_announcement_reconnection_mode=true",

    "INIT_leaudio_enable_health_based_actions=false",

    "INIT_leaudio_broadcast_audio_handover_policies=false",

    nullptr,

};



const char* test_flags_with_health_status[] = {

    "INIT_default_log_level_str=LOG_VERBOSE",

    "INIT_leaudio_targeted_announcement_reconnection_mode=true",

    "INIT_leaudio_enable_health_based_actions=true",

    "INIT_leaudio_broadcast_audio_handover_policies=false",

    nullptr,

};
@@ -117,7 +108,6 @@ const char* test_flags_with_health_status[] = { 
const char* test_flags_with_handover_mode[] = {

    "INIT_default_log_level_str=LOG_VERBOSE",

    "INIT_leaudio_targeted_announcement_reconnection_mode=true",

    "INIT_leaudio_enable_health_based_actions=false",

    "INIT_leaudio_broadcast_audio_handover_policies=true",

    nullptr,

};
@@ -375,7 +365,6 @@ class MockLeAudioSourceHalClient : public LeAudioSourceAudioHalClient { 


class UnicastTestNoInit : public Test {

 public:

  bool use_health_status = false;

  bool use_handover_mode = false;



 protected:
@@ -423,9 +412,7 @@ class UnicastTestNoInit : public Test { 
  }



  void SetUpMockAudioHal() {

    if (use_health_status) {

      bluetooth::common::InitFlags::Load(test_flags_with_health_status);

    } else if (use_handover_mode) {

    if (use_handover_mode) {

      bluetooth::common::InitFlags::Load(test_flags_with_handover_mode);

    } else {

      bluetooth::common::InitFlags::Load(test_flags);
@@ -2925,7 +2912,6 @@ class UnicastTest : public UnicastTestNoInit { 
class UnicastTestHealthStatus : public UnicastTest {

 protected:

  void SetUp() override {

    use_health_status = true;

    UnicastTest::SetUp();

    group_ = new LeAudioDeviceGroup(group_id_);

  }