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

Commit ebe82c6f authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Fix GATT not working due to address mismatch 

If the initial connection is established when using RPA, device can
later decide to use it's Identity Address for reconnections, if it
doesn't care about privacy.
When we receive such Identity Address, we must translate it into pseudo
address before passing it further down the stack.

Test: Connect to device using RPA, try to reconnect when it advertise
      it's Public address
Change-Id: Icb8eed25e1aad7003f1a3e0fed684168a8344544
parent fd1aeefb

system/stack/btm/btm_ble.cc

+10 −4
Original line number Diff line number Diff line
@@ -1923,15 +1923,21 @@ void btm_ble_conn_complete(uint8_t* p, UNUSED_ATTR uint16_t evt_len, 


#if (BLE_PRIVACY_SPT == TRUE)

    peer_addr_type = bda_type;



    if (peer_addr_type & BLE_ADDR_TYPE_ID_BIT) {

    bool addr_is_rpa =

        (peer_addr_type == BLE_ADDR_RANDOM && BTM_BLE_IS_RESOLVE_BDA(bda));



    /* We must translate whatever address we received into the "pseudo" address.

     * i.e. if we bonded with device that was using RPA for first connection,

     * "pseudo" address is equal to this RPA. If it later decides to use Public

     * address, or Random Static Address, we convert it into the "pseudo"

     * address here. */

    if (!addr_is_rpa || peer_addr_type & BLE_ADDR_TYPE_ID_BIT) {

      match = btm_identity_addr_to_random_pseudo(&bda, &bda_type, true);

    }



    /* possiblly receive connection complete with resolvable random while

       the device has been paired */

    if (!match && peer_addr_type == BLE_ADDR_RANDOM &&

        BTM_BLE_IS_RESOLVE_BDA(bda)) {

    if (!match && addr_is_rpa) {

      tBTM_SEC_DEV_REC* match_rec = btm_ble_resolve_random_addr(bda);

      if (match_rec) {

        LOG_INFO(LOG_TAG, "%s matched and resolved random address", __func__);