update new sdk
This commit is contained in:
parent
f33907443a
commit
744c72c133
1643 changed files with 83006 additions and 28021 deletions
20
android/system/bt/stack/btm/btm_dev.cc
Normal file → Executable file
20
android/system/bt/stack/btm/btm_dev.cc
Normal file → Executable file
|
@ -147,17 +147,16 @@ bool BTM_SecAddDevice(const RawAddress& bd_addr, DEV_CLASS dev_class,
|
|||
return true;
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
/** Free resources associated with the device associated with |bd_addr| address.
|
||||
*
|
||||
* Function BTM_SecDeleteDevice
|
||||
* *** WARNING ***
|
||||
* tBTM_SEC_DEV_REC associated with bd_addr becomes invalid after this function
|
||||
* is called, also any of it's fields. i.e. if you use p_dev_rec->bd_addr, it is
|
||||
* no longer valid!
|
||||
* *** WARNING ***
|
||||
*
|
||||
* Description Free resources associated with the device.
|
||||
*
|
||||
* Parameters: bd_addr - BD address of the peer
|
||||
*
|
||||
* Returns true if removed OK, false if not found or ACL link is active
|
||||
*
|
||||
******************************************************************************/
|
||||
* Returns true if removed OK, false if not found or ACL link is active.
|
||||
*/
|
||||
bool BTM_SecDeleteDevice(const RawAddress& bd_addr) {
|
||||
if (BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_LE) ||
|
||||
BTM_IsAclConnectionUp(bd_addr, BT_TRANSPORT_BR_EDR)) {
|
||||
|
@ -168,9 +167,10 @@ bool BTM_SecDeleteDevice(const RawAddress& bd_addr) {
|
|||
|
||||
tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);
|
||||
if (p_dev_rec != NULL) {
|
||||
RawAddress bda = p_dev_rec->bd_addr;
|
||||
btm_sec_free_dev(p_dev_rec);
|
||||
/* Tell controller to get rid of the link key, if it has one stored */
|
||||
BTM_DeleteStoredLinkKey(&p_dev_rec->bd_addr, NULL);
|
||||
BTM_DeleteStoredLinkKey(&bda, NULL);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue