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

Commit 2bb07c80 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "InitFlags: Remove leaudio_targeted_announcement_reconnection" into main

parents 192e0291 b8494a4a

system/bta/le_audio/client.cc

+2 −7
Original line number Diff line number Diff line
@@ -253,13 +253,8 @@ public: 
    LeAudioGroupStateMachine::Initialize(state_machine_callbacks_);

    groupStateMachine_ = LeAudioGroupStateMachine::Get();



    if (bluetooth::common::InitFlags::IsTargetedAnnouncementReconnectionMode()) {

    log::info("Reconnection mode: TARGETED_ANNOUNCEMENTS");

    reconnection_mode_ = BTM_BLE_BKG_CONNECT_TARGETED_ANNOUNCEMENTS;

    } else {

      log::info("Reconnection mode: ALLOW_LIST");

      reconnection_mode_ = BTM_BLE_BKG_CONNECT_ALLOW_LIST;

    }



    log::info("Loading health status module");

    leAudioHealthStatus_ = LeAudioHealthStatus::Get();

system/bta/le_audio/codec_manager_test.cc

+0 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include "audio_hal_client/audio_hal_client.h"

#include "audio_hal_interface/le_audio_software.h"

#include "common/init_flags.h"

#include "hci/controller_interface_mock.h"

#include "hci/hci_packets.h"

#include "internal_include/stack_config.h"
@@ -56,11 +55,6 @@ static const std::vector<AudioSetConfiguration> offload_capabilities_none(0); 


const std::vector<AudioSetConfiguration>* offload_capabilities = &offload_capabilities_none;



static const char* test_flags[] = {

        "INIT_default_log_level_str=LOG_VERBOSE",

        nullptr,

};



const std::string kSmpOptions("mock smp options");

bool get_pts_avrcp_test(void) { return false; }

bool get_pts_secure_only_mode(void) { return false; }
@@ -284,7 +278,6 @@ class CodecManagerTestBase : public Test { 
public:

  virtual void SetUp() override {

    __android_log_set_minimum_priority(ANDROID_LOG_VERBOSE);

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

    set_mock_offload_capabilities(offload_capabilities_none);



    bluetooth::legacy::hci::testing::SetMock(legacy_hci_mock_);

system/bta/le_audio/le_audio_client_test.cc

+0 −19
Original line number Diff line number Diff line
@@ -99,19 +99,6 @@ constexpr bluetooth::le_audio::types::LeAudioContextType kLeAudioDefaultConfigur 


static constexpr char kNotifyUpperLayerAboutGroupBeingInIdleDuringCall[] =

        "persist.bluetooth.leaudio.notify.idle.during.call";

const char* test_flags[] = {

        "INIT_default_log_level_str=LOG_VERBOSE",

        "INIT_leaudio_targeted_announcement_reconnection_mode=true",

        "INIT_leaudio_broadcast_audio_handover_policies=false",

        nullptr,

};



const char* test_flags_with_handover_mode[] = {

        "INIT_default_log_level_str=LOG_VERBOSE",

        "INIT_leaudio_targeted_announcement_reconnection_mode=true",

        "INIT_leaudio_broadcast_audio_handover_policies=true",

        nullptr,

};



void osi_property_set_bool(const char* key, bool value);
@@ -383,12 +370,6 @@ protected: 
  }



  void SetUpMockAudioHal() {

    if (use_handover_mode) {

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

    } else {

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

    }



    /* Since these are returned by the Acquire() methods as unique_ptrs, we

     * will not free them manually.

     */

system/bta/le_audio/le_audio_health_status_test.cc

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <gtest/gtest.h>



#include "bta/include/bta_groups.h"

#include "common/init_flags.h"

#include "test/common/mock_functions.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

system/bta/le_audio/state_machine_test.cc

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "bta_gatt_queue_mock.h"

#include "btm_api_mock.h"

#include "client_parser.h"

#include "common/init_flags.h"

#include "fake_osi.h"

#include "hci/controller_interface_mock.h"

#include "internal_include/stack_config.h"