Merge "eatt: Adjust to new L2CAP API behaviour" (1fb60983) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/eatt/eatt_impl.h

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -588,8 +588,13 @@ struct eatt_impl {
	while (iter != eatt_dev->eatt_channels.end()) {		while (iter != eatt_dev->eatt_channels.end()) {
	uint16_t cid = iter->first;		uint16_t cid = iter->first;
	disconnect_channel(cid);		disconnect_channel(cid);
	iter++;		/* When initiating disconnection, stack will not notify us that it is
			* done. We need to assume success
			*/
			iter = eatt_dev->eatt_channels.erase(iter);
	}		}
			eatt_dev->eatt_tcb_->eatt = 0;
			eatt_dev->eatt_tcb_ = nullptr;
	}		}

	void connect(const RawAddress& bd_addr) {		void connect(const RawAddress& bd_addr) {

system/stack/test/eatt/eatt_test.cc

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -100,14 +100,17 @@ class EattTest : public testing::Test {
	ASSERT_TRUE(test_tcb.eatt == num_of_accepted_connections);		ASSERT_TRUE(test_tcb.eatt == num_of_accepted_connections);
	}		}

			void DisconnectEattByPeer(void) {
			for (uint16_t cid : connected_cids_)
			l2cap_app_info_.pL2CA_DisconnectInd_Cb(cid, true);
			ASSERT_TRUE(test_tcb.eatt == 0);
			}

	void DisconnectEattDevice(void) {		void DisconnectEattDevice(void) {
	EXPECT_CALL(l2cap_interface_, DisconnectRequest(_))		EXPECT_CALL(l2cap_interface_, DisconnectRequest(_))
	.Times(connected_cids_.size());		.Times(connected_cids_.size());
	eatt_instance_->Disconnect(test_address);		eatt_instance_->Disconnect(test_address);

	for (uint16_t cid : connected_cids_)
	l2cap_app_info_.pL2CA_DisconnectInd_Cb(cid, true);

	ASSERT_TRUE(test_tcb.eatt == 0);		ASSERT_TRUE(test_tcb.eatt == 0);
	}		}

	@@ -206,14 +209,14 @@ TEST_F(EattTest, ConnectFailedSlaveOnTheLink) {
	}		}

	TEST_F(EattTest, DisonnectByPeerSucceed) {		TEST_F(EattTest, DisonnectByPeerSucceed) {
	ConnectDeviceEattSupported(1);		ConnectDeviceEattSupported(2);

	uint16_t cid = connected_cids_[0];		uint16_t cid = connected_cids_[0];
	EattChannel* channel =		EattChannel* channel =
	eatt_instance_->FindEattChannelByCid(test_address, cid);		eatt_instance_->FindEattChannelByCid(test_address, cid);
	ASSERT_TRUE(channel->state_ == EattChannelState::EATT_CHANNEL_OPENED);		ASSERT_TRUE(channel->state_ == EattChannelState::EATT_CHANNEL_OPENED);

	l2cap_app_info_.pL2CA_DisconnectInd_Cb(cid, true);		DisconnectEattByPeer();

	channel = eatt_instance_->FindEattChannelByCid(test_address, cid);		channel = eatt_instance_->FindEattChannelByCid(test_address, cid);
	ASSERT_TRUE(channel == nullptr);		ASSERT_TRUE(channel == nullptr);