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

Commit 633bb727 authored by Sukesh Srikakula's avatar Sukesh Srikakula Committed by Automerger Merge Worker
Browse files

Merge "Set ID_BIT in own_addr_type only when local privacy is enabled" am:... 

Merge "Set ID_BIT in own_addr_type only when local privacy is enabled" am: f522466b am: 0029c916

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1874057

Change-Id: I70cfe04fffd4a0fbb46e65149767125eabef7382
parents 07a56ca0 0029c916

system/stack/btm/btm_ble_bgconn.cc

+2 −0
Original line number Original line Diff line number Diff line
@@ -364,7 +364,9 @@ static bool btm_ble_start_auto_conn() { 
  btm_ble_enable_resolving_list_for_platform(BTM_BLE_RL_INIT);

  btm_ble_enable_resolving_list_for_platform(BTM_BLE_RL_INIT);

  if (btm_cb.ble_ctr_cb.rl_state != BTM_BLE_RL_IDLE &&

  if (btm_cb.ble_ctr_cb.rl_state != BTM_BLE_RL_IDLE &&

      controller_get_interface()->supports_ble_privacy()) {

      controller_get_interface()->supports_ble_privacy()) {

#if (BLE_LOCAL_PRIVACY_ENABLED == TRUE)

    own_addr_type |= BLE_ADDR_TYPE_ID_BIT;

    own_addr_type |= BLE_ADDR_TYPE_ID_BIT;

#endif

    peer_addr_type |= BLE_ADDR_TYPE_ID_BIT;

    peer_addr_type |= BLE_ADDR_TYPE_ID_BIT;

  }

  }