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

Commit 0117c10d authored by Sharvil Nanavati's avatar Sharvil Nanavati Committed by Android (Google) Code Review
Browse files

Merge "Send current RPA instead of pseudo-address on connect." into cw-e-dev

parents ef96c905 7f94e4d9

system/stack/btm/btm_ble.c

+3 −3
Original line number Diff line number Diff line
@@ -1847,9 +1847,9 @@ void btm_ble_conn_complete(UINT8 *p, UINT16 evt_len, BOOLEAN enhanced) 
            STREAM_TO_BDADDR   (peer_rpa, p);

        }



        /* possiblly receive connection complete with resolvable random on

           slave role while the device has been paired */

        if (!match && role == HCI_ROLE_SLAVE && BTM_BLE_IS_RESOLVE_BDA(bda))

        /* possiblly receive connection complete with resolvable random while

           the device has been paired */

        if (!match && BTM_BLE_IS_RESOLVE_BDA(bda))

        {

            btm_ble_resolve_random_addr(bda, btm_ble_resolve_random_addr_on_conn_cmpl, p_data);

        }

system/stack/l2cap/l2c_ble.c

+7 −2
Original line number Diff line number Diff line
@@ -714,9 +714,14 @@ BOOLEAN l2cble_init_direct_conn (tL2C_LCB *p_lcb) 


        btm_ble_enable_resolving_list(BTM_BLE_RL_INIT);

        btm_random_pseudo_to_identity_addr(peer_addr, &peer_addr_type);

    }

    else

    } else {

        btm_ble_disable_resolving_list(BTM_BLE_RL_INIT, TRUE);



        // If we have a current RPA, use that instead.

        if (!bdaddr_is_empty((const bt_bdaddr_t *)p_dev_rec->ble.cur_rand_addr)) {

            memcpy(peer_addr, p_dev_rec->ble.cur_rand_addr, BD_ADDR_LEN);

        }

    }

#endif



    if (!btm_ble_topology_check(BTM_BLE_STATE_INIT))