Commit d4d5d559 authored Mar 12, 2024 by yamei du Committed by Bhakthavatsala Raghavendra Sep 04, 2024

btm_ble_sec: Reset btm pairing state when returning early from handling SMP_COMPLT_EVT

When SMP pairing fails and the device record is not allocated, handling
SMP_COMPLT_EVT will return early without resetting the BTM pairing
state to IDLE. Subsequent pairing attempts triggered immediately after
the previous failure will fail.

Bug: 331682621
Bug: 364321751

Test: m com.android.btservices
Test: Manual
1. Power off BLE device after it is displayed in scanning list
2. Trigger pairing to the BLE device from local device.
3. After pairing fail, trigger another paring immediately

Change-Id: Ie4d3294a321a436727b70eb6ee2823f79ea585fe

parent 19410862

system/stack/btm/btm_ble_sec.cc

+7 −0

Original line number	Diff line number	Diff line
		@@ -1688,6 +1688,13 @@ tBTM_STATUS btm_proc_smp_cback(tSMP_EVT event, const RawAddress& bd_addr, tSMP_E

		if (p_dev_rec == nullptr) {
		log::warn("Unexpected event '{}' for unknown device.", smp_evt_to_text(event));
		if (com::android::bluetooth::flags::clear_pairing_state_when_no_devrec() &&
		bd_addr == btm_sec_cb.pairing_bda &&
		event == SMP_COMPLT_EVT) {
		btm_sec_cb.pairing_bda = RawAddress::kAny;
		btm_sec_cb.pairing_state = BTM_PAIR_STATE_IDLE;
		btm_sec_cb.pairing_flags = 0;
		}
		return tBTM_STATUS::BTM_UNKNOWN_ADDR;
		}