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

Commit 17e77d26 authored by Zhengping Jiang's avatar Zhengping Jiang Committed by Automerger Merge Worker
Browse files

Merge "floss: check privacy mode when return address with type" into main am: 760caf15 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2717818



Change-Id: I1e019b870ce6bb3ff7a9173f4e51bf420013a787
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d12f61c7 760caf15

system/stack/btm/btm_ble_bgconn.cc

+4 −3
Original line number Diff line number Diff line
@@ -84,11 +84,12 @@ const tBLE_BD_ADDR convert_to_address_with_type( 
    };

  } else {

    // Floss doesn't support LL Privacy (yet). To expedite ARC testing, always

    // connect to the latest LE random address (if available) rather than

    // redesign.

    // connect to the latest LE random address (if available and LL Privacy is

    // not enabled) rather than redesign.

    // TODO(b/235218533): Remove when LL Privacy is implemented.

#if TARGET_FLOSS

    if (!p_dev_rec->ble.cur_rand_addr.IsEmpty()) {

    if (!p_dev_rec->ble.cur_rand_addr.IsEmpty() &&

        btm_cb.ble_ctr_cb.privacy_mode < BTM_PRIVACY_1_2) {

      return {

          .type = BLE_ADDR_RANDOM,

          .bda = p_dev_rec->ble.cur_rand_addr,