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

Commit 001b016f authored by Zhihai Xu's avatar Zhihai Xu Committed by Android Git Automerger
Browse files

am 3a3e6eb6: Merge "treat BTA_BUSY as success to avoid unpair the BLE device" into klp-modular-dev 

* commit '3a3e6eb6':
  treat BTA_BUSY as success to avoid unpair the BLE device
parents 61ccea51 3a3e6eb6

system/btif/src/btif_gatt_util.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static BOOLEAN btif_gatt_is_link_encrypted (BD_ADDR bd_addr) 


static void btif_gatt_set_encryption_cb (BD_ADDR bd_addr, tBTA_STATUS result)

{

    if (result != BTA_SUCCESS)

    if (result != BTA_SUCCESS && result != BTA_BUSY)

    {

        bt_bdaddr_t bda;

        bdcpy(bda.address, bd_addr);

system/stack/btm/btm_ble_addr.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static BOOLEAN btm_ble_match_random_bda(UINT16 rec_index) 
    {

        p_dev_rec = &btm_cb.sec_dev_rec[rec_index];



        BTM_TRACE_ERROR2("sec_flags = %02x device_type = %d", p_dev_rec->sec_flags, p_dev_rec->device_type);

        BTM_TRACE_DEBUG2("sec_flags = %02x device_type = %d", p_dev_rec->sec_flags, p_dev_rec->device_type);



        if ((p_dev_rec->device_type == BT_DEVICE_TYPE_BLE) &&

            (p_dev_rec->ble.key_type & BTM_LE_KEY_PID))