Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f45234f authored by Zhihai Xu's avatar Zhihai Xu
Browse files

Remove the device from le backgrond connection whitelist when it's unpaired 

this is due to we didn't remove the device from the white list before unpair
Which cause a fake pair request from remote device triggered
right after the acl is disconnected.
The fix is to remove the BLE device from whitelist before unpair.
Also fix a problem return wrong device handle from bta_hh_le_add_device.

if bta_hh_le_add_device is called right after reboot, before we connect HID device.
This is normally true for a previous paired device, which we saved in the nvram.
The wrong device handle will cause the removing HID device from while list failed
after unpair the HID device.

bug:11676338
Change-Id: Id5b45b2829da9a990dfd1dbae0c15764b16c2bfb
parent b694624c

system/bta/dm/bta_dm_act.c

+20 −0
Original line number Diff line number Diff line
@@ -673,6 +673,11 @@ void bta_dm_remove_device (tBTA_DM_MSG *p_data) 
    int i;

    tBTA_DM_SEC sec_event;



#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)

    /* need to remove all pending background connection before unpair */

    BTA_GATTC_CancelOpen(0, p_dev->bd_addr, FALSE);

#endif



    if (BTM_IsAclConnectionUp(p_dev->bd_addr))

    {

        /* Take the link down first, and mark the device for removal when disconnected */
@@ -692,6 +697,11 @@ void bta_dm_remove_device (tBTA_DM_MSG *p_data) 
    else    /* Ok to remove the device in application layer */

    {

        BTM_SecDeleteDevice(p_dev->bd_addr);

#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)

        /* remove all cached GATT information */

        BTA_GATTC_Refresh(p_dev->bd_addr);

#endif



        if( bta_dm_cb.p_sec_cback )

        {

            bdcpy(sec_event.link_down.bd_addr, p_dev->bd_addr);
@@ -3459,6 +3469,10 @@ void bta_dm_acl_change(tBTA_DM_MSG *p_data) 
            if( bta_dm_cb.device_list.peer_device[i].conn_state == BTA_DM_UNPAIRING )

            {

                BTM_SecDeleteDevice(bta_dm_cb.device_list.peer_device[i].peer_bdaddr);

#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)

                /* remove all cached GATT information */

                BTA_GATTC_Refresh(p_bda);

#endif

                issue_unpair_cb = TRUE;

            }
@@ -3768,6 +3782,12 @@ static void bta_dm_remove_sec_dev_entry(BD_ADDR remote_bd_addr) 
    else

    {

        BTM_SecDeleteDevice (remote_bd_addr);

#if (BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE)

        /* need to remove all pending background connection */

        BTA_GATTC_CancelOpen(0, remote_bd_addr, FALSE);

        /* remove all cached GATT information */

        BTA_GATTC_Refresh(remote_bd_addr);

#endif

    }

}

system/bta/hh/bta_hh_le.c

+2 −0
Original line number Diff line number Diff line
@@ -2593,6 +2593,8 @@ static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB *p_cb, BOOLEAN check_bond) 
*******************************************************************************/

UINT8 bta_hh_le_add_device(tBTA_HH_DEV_CB *p_cb, tBTA_HH_MAINT_DEV *p_dev_info)

{

    p_cb->hid_handle = BTA_HH_GET_LE_DEV_HDL(p_cb->index);

    bta_hh_cb.le_cb_index[BTA_HH_GET_LE_CB_IDX(p_cb->hid_handle)] = p_cb->index;



    /* update DI information */

    bta_hh_update_di_info(p_cb,