Snap for 7253016 from 80970c892646c4fb1de1175951c77dbb5300a43b to sc-release (251e6a31) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_hal_interface/client_interface.cc

+13 −5

Original line number	Diff line number	Diff line
		@@ -418,15 +418,18 @@ BluetoothAudioSinkClientInterface::BluetoothAudioSinkClientInterface(
		this, message_loop),
		sink},
		sink_(sink) {
		if (HalVersionManager::GetHalVersion() ==
		BluetoothAudioHalVersion::VERSION_UNAVAILABLE) {
		return;
		}

		if ((HalVersionManager::GetHalVersion() ==
		BluetoothAudioHalVersion::VERSION_2_1) &&
		(sink_->GetSessionType_2_1() != SessionType_2_1::UNKNOWN)) {
		FetchAudioProvider_2_1();

		return;
		}

		if (sink_->GetSessionType() != SessionType::UNKNOWN) FetchAudioProvider();
		FetchAudioProvider();
		}

		BluetoothAudioSinkClientInterface::~BluetoothAudioSinkClientInterface() {
		@@ -453,13 +456,18 @@ BluetoothAudioSourceClientInterface::BluetoothAudioSourceClientInterface(
		this, message_loop),
		source},
		source_(source) {
		if (HalVersionManager::GetHalVersion() ==
		BluetoothAudioHalVersion::VERSION_UNAVAILABLE) {
		return;
		}

		if ((HalVersionManager::GetHalVersion() ==
		BluetoothAudioHalVersion::VERSION_2_1) &&
		(source_->GetSessionType_2_1() != SessionType_2_1::UNKNOWN)) {
		FetchAudioProvider_2_1();
		return;
		}

		if (source_->GetSessionType() != SessionType::UNKNOWN) FetchAudioProvider();
		FetchAudioProvider();
		}

		BluetoothAudioSourceClientInterface::~BluetoothAudioSourceClientInterface() {

+4 −0

Original line number	Diff line number	Diff line
		@@ -92,6 +92,10 @@ void RoundRobinScheduler::start_round_robin() {
		send_next_fragment();
		return;
		}
		if (acl_queue_handlers_.empty()) {
		LOG_INFO("No any acl connection");
		return;
		}

		if (acl_queue_handlers_.size() == 1 \|\| starting_point_ == acl_queue_handlers_.end()) {
		starting_point_ = acl_queue_handlers_.begin();

+2 −0

Original line number	Diff line number	Diff line
		@@ -2494,6 +2494,7 @@ enum HciVersion : 8 {
		V_4_2 = 0x08,
		V_5_0 = 0x09,
		V_5_1 = 0x0a,
		V_5_2 = 0x0b,
		}

		enum LmpVersion : 8 {
		@@ -2508,6 +2509,7 @@ enum LmpVersion : 8 {
		V_4_2 = 0x08,
		V_5_0 = 0x09,
		V_5_1 = 0x0a,
		V_5_2 = 0x0b,
		}

		struct LocalVersionInformation {

+10 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,16 @@ static future_t* start_up(void) {
		data_.le_supported_states =
		bluetooth::shim::GetController()->GetLeSupportedStates();

		auto local_version_info =
		bluetooth::shim::GetController()->GetLocalVersionInformation();
		data_.bt_version.hci_version =
		static_cast<uint8_t>(local_version_info.hci_version_);
		data_.bt_version.hci_revision = local_version_info.hci_revision_;
		data_.bt_version.lmp_version =
		static_cast<uint8_t>(local_version_info.lmp_version_);
		data_.bt_version.lmp_subversion = local_version_info.lmp_subversion_;
		data_.bt_version.manufacturer = local_version_info.manufacturer_name_;

		LOG_INFO("Mac address:%s", string_address.c_str());
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -419,7 +419,7 @@ void ConnectionHandler::MessageCb(uint8_t handle, uint8_t label, uint8_t opcode,
		device_map_[handle]->MessageReceived(label, Packet::Parse(pkt));
		}

		void ConnectionHandler::SdpCb(const RawAddress& bdaddr, SdpCallback cb,
		void ConnectionHandler::SdpCb(RawAddress bdaddr, SdpCallback cb,
		tSDP_DISCOVERY_DB* disc_db, bool retry,
		uint16_t status) {
		VLOG(1) << __PRETTY_FUNCTION__ << ": SDP lookup callback received";