Commit d69928a3 authored Nov 18, 2022 by Huirong Liao

Fix connect fail when bonding then connect

[Root Cause]
when it's connecting an non-connectable device, app connect
 to it again. and the l2cap statue indicates there is a lcb
 for the address. then it return true to notify gatt connected
 and it will cancel the connect timer. the connection will not
 timeout and the smp flag will be always paring.

[Solution]
we should return false when it's connecting.

Bug: 265983604
Test: atest net_test_btif_stack pass

Change-Id: I8c5ca19d634d5ecee3dfcb8e5def3eaefa22ca99

parent d5f4e5ec

system/stack/l2cap/l2c_utils.cc

+6 −1

Original line number	Diff line number	Diff line
		@@ -2665,7 +2665,12 @@ bool l2cu_initialize_fixed_ccb(tL2C_LCB* p_lcb, uint16_t fixed_cid) {
		p_ccb = l2cu_allocate_ccb(NULL, 0);
		if (p_ccb == NULL) return (false);

		if (p_lcb->link_state == LST_DISCONNECTED) {
		alarm_cancel(p_lcb->l2c_lcb_timer);
		} else {
		LOG_WARN("Unable to cancel link control block for link connection to device %s",
		ADDRESS_TO_LOGGABLE_CSTR(p_lcb->remote_bd_addr));
		}

		/* Set CID for the connection */
		p_ccb->local_cid = fixed_cid;