Merge branch 'bugfix/SCO_connect_fail_after_peer_not_accept_sniff_v4.0' into 'release/v4.0'

bugfix/unable to initiate SCO connection when peer device not accept sniff mode (v4.0)

See merge request espressif/esp-idf!14402
This commit is contained in:
Jiang Jiang Jian 2021-07-20 04:14:30 +00:00
commit fa6886f898
2 changed files with 4 additions and 1 deletions

@ -1 +1 @@
Subproject commit 2289aaf8ed5bbf3de7cab8f27d8b53653bdbddb2
Subproject commit 19f905ff4d60d2387046dbb1cdb27f6defd24f28

View File

@ -860,6 +860,8 @@ BOOLEAN BTM_BleConfigPrivacy(BOOLEAN privacy_mode, tBTM_SET_LOCAL_PRIVACY_CBACK
(*random_cb->set_local_privacy_cback)(BTM_SET_PRIVACY_SUCCESS);
random_cb->set_local_privacy_cback = NULL;
}
//Disable RPA function
btsnd_hcic_ble_set_addr_resolution_enable(FALSE);
} else { /* privacy is turned on*/
/* always set host random address, used when privacy 1.1 or priavcy 1.2 is disabled */
btm_gen_resolvable_private_addr((void *)btm_gen_resolve_paddr_low);
@ -878,6 +880,7 @@ BOOLEAN BTM_BleConfigPrivacy(BOOLEAN privacy_mode, tBTM_SET_LOCAL_PRIVACY_CBACK
} else { /* 4.1/4.0 controller */
p_cb->privacy_mode = BTM_PRIVACY_1_1;
}
btsnd_hcic_ble_set_addr_resolution_enable(TRUE);
}
#if (defined(GAP_INCLUDED) && GAP_INCLUDED == TRUE && GATTS_INCLUDED == TRUE)