Merge "GD Controller: replace is_ready" into main (08e9004d) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -788,7 +788,6 @@ cc_test {
		"le_audio/le_audio_set_configuration_provider_json.cc",
		"le_audio/le_audio_types.cc",
		"le_audio/le_audio_utils.cc",
		"test/common/mock_controller.cc",
		],
		data: [
		":audio_set_configurations_bfbs",
		@@ -893,7 +892,6 @@ cc_test {
		"test/common/bta_gatt_queue_mock.cc",
		"test/common/btif_storage_mock.cc",
		"test/common/btm_api_mock.cc",
		"test/common/mock_controller.cc",
		"test/common/mock_csis_client.cc",
		],
		data: [
		@@ -988,7 +986,6 @@ cc_test {
		"test/common/bta_gatt_queue_mock.cc",
		"test/common/btif_storage_mock.cc",
		"test/common/btm_api_mock.cc",
		"test/common/mock_controller.cc",
		"test/common/mock_csis_client.cc",
		"test/common/mock_device_groups.cc",
		],
		@@ -1153,7 +1150,6 @@ cc_test {
		"le_audio/metrics_collector_linux.cc",
		"le_audio/mock_codec_interface.cc",
		"le_audio/mock_codec_manager.cc",
		"test/common/mock_controller.cc",
		],
		shared_libs: [
		"libbinder_ndk",
		@@ -1224,7 +1220,6 @@ cc_test {
		"test/common/bta_gatt_queue_mock.cc",
		"test/common/btif_storage_mock.cc",
		"test/common/btm_api_mock.cc",
		"test/common/mock_controller.cc",
		"test/common/mock_csis_client.cc",
		],
		shared_libs: [

system/bta/has/has_client_test.cc

+0 −4

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@
		#include "gatt/database_builder.h"
		#include "hardware/bt_gatt_types.h"
		#include "has_types.h"
		#include "mock_controller.h"
		#include "mock_csis_client.h"
		#include "stack/include/bt_uuid16.h"
		#include "test/common/mock_functions.h"
		@@ -656,7 +655,6 @@ class HasClientTestBase : public ::testing::Test {

		void SetUp(void) override {
		reset_mock_function_count_map();
		controller::SetMockControllerInterface(&controller_interface_);
		bluetooth::manager::SetMockBtmInterface(&btm_interface);
		bluetooth::storage::SetMockBtifStorageInterface(&btif_storage_interface_);
		gatt::SetMockBtaGattInterface(&gatt_interface);
		@@ -761,7 +759,6 @@ class HasClientTestBase : public ::testing::Test {
		gatt::SetMockBtaGattInterface(nullptr);
		bluetooth::storage::SetMockBtifStorageInterface(nullptr);
		bluetooth::manager::SetMockBtmInterface(nullptr);
		controller::SetMockControllerInterface(nullptr);
		callbacks.reset();

		current_peer_active_preset_idx_.clear();
		@@ -1172,7 +1169,6 @@ class HasClientTestBase : public ::testing::Test {
		std::unique_ptr<MockHasCallbacks> callbacks;
		bluetooth::manager::MockBtmInterface btm_interface;
		bluetooth::storage::MockBtifStorageInterface btif_storage_interface_;
		controller::MockControllerInterface controller_interface_;
		gatt::MockBtaGattInterface gatt_interface;
		gatt::MockBtaGattQueue gatt_queue;
		MockCsisClient mock_csis_client_module_;

system/bta/le_audio/broadcaster/broadcaster_test.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		#include "bta/le_audio/content_control_id_keeper.h"
		#include "bta/le_audio/le_audio_types.h"
		#include "bta/le_audio/mock_codec_manager.h"
		#include "bta/test/common/mock_controller.h"
		#include "hci/controller_interface_mock.h"
		#include "stack/include/btm_iso_api.h"
		#include "test/common/mock_functions.h"

system/bta/le_audio/devices_test.cc

+0 −7

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@
		#include "le_audio_set_configuration_provider.h"
		#include "le_audio_types.h"
		#include "mock_codec_manager.h"
		#include "mock_controller.h"
		#include "mock_csis_client.h"
		#include "os/log.h"
		#include "stack/btm/btm_int_types.h"
		@@ -67,12 +66,10 @@ class LeAudioDevicesTest : public Test {
		void SetUp() override {
		devices_ = new LeAudioDevices();
		bluetooth::manager::SetMockBtmInterface(&btm_interface);
		controller::SetMockControllerInterface(&controller_interface_);
		bluetooth::storage::SetMockBtifStorageInterface(&mock_btif_storage_);
		}

		void TearDown() override {
		controller::SetMockControllerInterface(nullptr);
		bluetooth::manager::SetMockBtmInterface(nullptr);
		bluetooth::storage::SetMockBtifStorageInterface(nullptr);
		delete devices_;
		@@ -80,7 +77,6 @@ class LeAudioDevicesTest : public Test {

		LeAudioDevices* devices_ = nullptr;
		bluetooth::manager::MockBtmInterface btm_interface;
		controller::MockControllerInterface controller_interface_;
		bluetooth::storage::MockBtifStorageInterface mock_btif_storage_;
		};

		@@ -473,7 +469,6 @@ class LeAudioAseConfigurationTest : public Test {
		void SetUp() override {
		group_ = new LeAudioDeviceGroup(group_id_);
		bluetooth::manager::SetMockBtmInterface(&btm_interface_);
		controller::SetMockControllerInterface(&controller_interface_);

		auto codec_location = ::bluetooth::le_audio::types::CodecLocation::HOST;
		bluetooth::le_audio::AudioSetConfigurationProvider::Initialize(
		@@ -527,7 +522,6 @@ class LeAudioAseConfigurationTest : public Test {
		}

		void TearDown() override {
		controller::SetMockControllerInterface(nullptr);
		bluetooth::manager::SetMockBtmInterface(nullptr);
		devices_.clear();
		addresses_.clear();
		@@ -983,7 +977,6 @@ class LeAudioAseConfigurationTest : public Test {
		std::vector<RawAddress> addresses_;
		LeAudioDeviceGroup* group_ = nullptr;
		bluetooth::manager::MockBtmInterface btm_interface_;
		controller::MockControllerInterface controller_interface_;
		MockCsisClient mock_csis_client_module_;

		bluetooth::le_audio::CodecManager* codec_manager_;

system/bta/le_audio/le_audio_client_test.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@
		#include "le_audio_set_configuration_provider.h"
		#include "le_audio_types.h"
		#include "mock_codec_manager.h"
		#include "mock_controller.h"
		#include "mock_csis_client.h"
		#include "mock_device_groups.h"
		#include "mock_state_machine.h"