Commit 54c4c9a2 authored Aug 22, 2023 by Jakub Pawlowski

Fix unexpected pairing failures after CTKD

Before:
1. Bond on LE Tranport, then use CTKD to generate Classic Keys.
2. Immediately establish BR/EDR connection.
3. Remote returns no SMP support in "Fixed Channels Supported".
4. L2CAP layer tells SMP BR module SMP channel is closed.
5. SMP BR module triggers pairing failure

After:
L2CAP layer is smart, knows to not pass the channel closed event when
SMP BR module is in IDLE state after CTKD.

Test: Bond using LE transport with device that does not support SMP on
      BR/EDR multiple times.
Bug: 296326447
Change-Id: I6b0b3f271dc21f15b3f9e483e366b24c139afc63

parent 51297cf5

system/stack/smp/smp_l2c.cc

+2 −1

Original line number	Diff line number	Diff line
		@@ -257,7 +257,8 @@ static void smp_br_connect_callback(uint16_t channel, const RawAddress& bd_addr,
		* Classic transport shouldn't impact that.
		*/
		tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_cb->pairing_bda);
		if (smp_get_state() == SMP_STATE_BOND_PENDING &&
		if ((smp_get_state() == SMP_STATE_BOND_PENDING \|\|
		smp_get_state() == SMP_STATE_IDLE) &&
		(p_dev_rec && p_dev_rec->is_link_key_known()) &&
		alarm_is_scheduled(p_cb->delayed_auth_timer_ent)) {
		/* If we were to not return here, we would reset SMP control block, and