Snap for 6035658 from a5d6217de31904d7a058a01a9ff42bd16b09895a to rvc-release (b6d19b36) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_hal_interface/a2dp_encoding.cc

+4 −10

Original line number	Diff line number	Diff line
		@@ -82,11 +82,10 @@ class A2dpTransport : public ::bluetooth::audio::IBluetoothTransportInstance {
		return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_INCALL_FAILURE);
		}

		if (btif_a2dp_source_is_streaming()) {
		LOG(ERROR) << __func__ << ": source is busy streaming";
		return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_FAILURE);
		if (btif_av_stream_started_ready()) {
		// Already started, ACK back immediately.
		return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_SUCCESS);
		}

		if (btif_av_stream_ready()) {
		/*
		* Post start event and wait for audio path to open.
		@@ -102,11 +101,6 @@ class A2dpTransport : public ::bluetooth::audio::IBluetoothTransportInstance {
		a2dp_pending_cmd_ = A2DP_CTRL_CMD_NONE;
		return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_SUCCESS);
		}

		if (btif_av_stream_started_ready()) {
		// Already started, ACK back immediately.
		return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_SUCCESS);
		}
		LOG(ERROR) << __func__ << ": AV stream is not ready to start";
		return a2dp_ack_to_bt_audio_ctrl_ack(A2DP_CTRL_ACK_FAILURE);
		}
		@@ -137,7 +131,7 @@ class A2dpTransport : public ::bluetooth::audio::IBluetoothTransportInstance {

		void StopRequest() override {
		if (btif_av_get_peer_sep() == AVDT_TSEP_SNK &&
		!btif_a2dp_source_is_streaming()) {
		!btif_av_stream_started_ready()) {
		return;
		}
		LOG(INFO) << __func__ << ": handling";

system/btif/src/btif_av.cc

+24 −11

Original line number	Diff line number	Diff line
		@@ -2861,6 +2861,27 @@ void btif_av_stream_start(void) {
		BTIF_AV_START_STREAM_REQ_EVT);
		}

		void src_do_suspend_in_main_thread(btif_av_sm_event_t event) {
		if (event != BTIF_AV_SUSPEND_STREAM_REQ_EVT &&
		event != BTIF_AV_STOP_STREAM_REQ_EVT)
		return;
		auto src_do_stream_suspend = [](btif_av_sm_event_t event) {
		bool is_idle = true;
		for (auto it : btif_av_source.Peers()) {
		const BtifAvPeer* peer = it.second;
		if (peer->StateMachine().StateId() == BtifAvStateMachine::kStateStarted) {
		btif_av_source_dispatch_sm_event(peer->PeerAddress(), event);
		is_idle = false;
		}
		}
		if (is_idle) {
		btif_a2dp_on_stopped(nullptr);
		}
		};
		// switch to main thread to prevent a race condition of accessing peers
		do_in_main_thread(FROM_HERE, base::Bind(src_do_stream_suspend, event));
		}

		void btif_av_stream_stop(const RawAddress& peer_address) {
		LOG_INFO(LOG_TAG, "%s peer %s", __func__, peer_address.ToString().c_str());

		@@ -2870,23 +2891,15 @@ void btif_av_stream_stop(const RawAddress& peer_address) {
		}

		// The active peer might have changed and we might be in the process
		// of reconfiguring the stream. We need to stop the appopriate peer(s).
		for (auto it : btif_av_source.Peers()) {
		const BtifAvPeer* peer = it.second;
		btif_av_source_dispatch_sm_event(peer->PeerAddress(),
		BTIF_AV_STOP_STREAM_REQ_EVT);
		}
		// of reconfiguring the stream. We need to stop the appropriate peer(s).
		src_do_suspend_in_main_thread(BTIF_AV_STOP_STREAM_REQ_EVT);
		}

		void btif_av_stream_suspend(void) {
		LOG_INFO(LOG_TAG, "%s", __func__);
		// The active peer might have changed and we might be in the process
		// of reconfiguring the stream. We need to suspend the appropriate peer(s).
		for (auto it : btif_av_source.Peers()) {
		const BtifAvPeer* peer = it.second;
		btif_av_source_dispatch_sm_event(peer->PeerAddress(),
		BTIF_AV_SUSPEND_STREAM_REQ_EVT);
		}
		src_do_suspend_in_main_thread(BTIF_AV_SUSPEND_STREAM_REQ_EVT);
		}

		void btif_av_stream_start_offload(void) {

system/gd/l2cap/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ filegroup {
		"classic/internal/signalling_manager.cc",
		"classic/l2cap_classic_module.cc",
		"internal/basic_mode_channel_data_controller.cc",
		"internal/data_pipeline_manager.cc",
		"internal/enhanced_retransmission_mode_channel_data_controller.cc",
		"internal/le_credit_based_channel_data_controller.cc",
		"internal/receiver.cc",

system/gd/l2cap/classic/internal/dynamic_channel_allocator_fuzz_test.cc

+1 −2

Original line number	Diff line number	Diff line
		@@ -48,8 +48,7 @@ class L2capClassicDynamicChannelAllocatorFuzzTest {
		handler_ = new os::Handler(thread_);
		mock_parameter_provider_ = new NiceMock<MockParameterProvider>();
		mock_classic_link_ =
		new NiceMock<MockLink>(handler_, mock_parameter_provider_, std::make_unique<NiceMock<MockAclConnection>>(),
		std::make_unique<NiceMock<MockScheduler>>());
		new NiceMock<MockLink>(handler_, mock_parameter_provider_, std::make_unique<NiceMock<MockAclConnection>>());
		EXPECT_CALL(*mock_classic_link_, GetDevice()).WillRepeatedly(Return(device));
		channel_allocator_ = std::make_unique<DynamicChannelAllocator>(mock_classic_link_, handler_);
		}

system/gd/l2cap/classic/internal/link.cc

+7 −11

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		#include "l2cap/classic/internal/fixed_channel_impl.h"
		#include "l2cap/classic/internal/link.h"
		#include "l2cap/internal/parameter_provider.h"
		#include "l2cap/internal/scheduler.h"
		#include "os/alarm.h"

		namespace bluetooth {
		@@ -31,19 +30,16 @@ namespace classic {
		namespace internal {

		Link::Link(os::Handler* l2cap_handler, std::unique_ptr<hci::AclConnection> acl_connection,
		std::unique_ptr<l2cap::internal::Scheduler> scheduler,
		l2cap::internal::ParameterProvider* parameter_provider,
		DynamicChannelServiceManagerImpl* dynamic_service_manager,
		FixedChannelServiceManagerImpl* fixed_service_manager)
		: l2cap_handler_(l2cap_handler), acl_connection_(std::move(acl_connection)), scheduler_(std::move(scheduler)),
		receiver_(acl_connection_->GetAclQueueEnd(), l2cap_handler_, scheduler_.get()),
		parameter_provider_(parameter_provider), dynamic_service_manager_(dynamic_service_manager),
		fixed_service_manager_(fixed_service_manager),
		: l2cap_handler_(l2cap_handler), acl_connection_(std::move(acl_connection)),
		data_pipeline_manager_(l2cap_handler, acl_connection_->GetAclQueueEnd()), parameter_provider_(parameter_provider),
		dynamic_service_manager_(dynamic_service_manager), fixed_service_manager_(fixed_service_manager),
		signalling_manager_(l2cap_handler_, this, dynamic_service_manager_, &dynamic_channel_allocator_,
		fixed_service_manager_) {
		ASSERT(l2cap_handler_ != nullptr);
		ASSERT(acl_connection_ != nullptr);
		ASSERT(scheduler_ != nullptr);
		ASSERT(parameter_provider_ != nullptr);
		link_idle_disconnect_alarm_.Schedule(common::BindOnce(&Link::Disconnect, common::Unretained(this)),
		parameter_provider_->GetClassicLinkIdleDisconnectTimeout());
		@@ -60,7 +56,7 @@ void Link::Disconnect() {

		std::shared_ptr<FixedChannelImpl> Link::AllocateFixedChannel(Cid cid, SecurityPolicy security_policy) {
		auto channel = fixed_channel_allocator_.AllocateChannel(cid, security_policy);
		scheduler_->AttachChannel(cid, channel);
		data_pipeline_manager_.AttachChannel(cid, channel);
		return channel;
		}

		@@ -94,7 +90,7 @@ std::shared_ptr<DynamicChannelImpl> Link::AllocateDynamicChannel(Psm psm, Cid re
		SecurityPolicy security_policy) {
		auto channel = dynamic_channel_allocator_.AllocateChannel(psm, remote_cid, security_policy);
		if (channel != nullptr) {
		scheduler_->AttachChannel(channel->GetCid(), channel);
		data_pipeline_manager_.AttachChannel(channel->GetCid(), channel);
		}
		channel->local_initiated_ = false;
		return channel;
		@@ -104,7 +100,7 @@ std::shared_ptr<DynamicChannelImpl> Link::AllocateReservedDynamicChannel(Cid res
		SecurityPolicy security_policy) {
		auto channel = dynamic_channel_allocator_.AllocateReservedChannel(reserved_cid, psm, remote_cid, security_policy);
		if (channel != nullptr) {
		scheduler_->AttachChannel(channel->GetCid(), channel);
		data_pipeline_manager_.AttachChannel(channel->GetCid(), channel);
		}
		channel->local_initiated_ = true;
		return channel;
		@@ -120,7 +116,7 @@ void Link::FreeDynamicChannel(Cid cid) {
		if (dynamic_channel_allocator_.FindChannelByCid(cid) == nullptr) {
		return;
		}
		scheduler_->DetachChannel(cid);
		data_pipeline_manager_.DetachChannel(cid);
		dynamic_channel_allocator_.FreeChannel(cid);
		}