Merge "btm_sec: Don't trigger new authentication before collision timer expired" into main (3e61af78) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_sec.cc

+8 −0

Original line number	Diff line number	Diff line
		@@ -4513,6 +4513,14 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) {
		}

		if (start_auth) {
		if (com::android::bluetooth::flags::ignore_auth_req_when_collision_timer_active() &&
		alarm_is_scheduled(btm_sec_cb.sec_collision_timer) &&
		(btm_sec_cb.p_collided_dev_rec->bd_addr == p_dev_rec->bd_addr)) {
		log::debug(
		"Security Manager: Authentication will be executed after collision "
		"timer expired");
		return tBTM_STATUS::BTM_CMD_STARTED;
		}
		log::debug("Security Manager: Start authentication");

		/*