commit 125df66538a59102071f410f9cda45f29b6ada9b
author Sukesh Srikakula <sukeshs@google.com> Fri Oct 29 02:13:04 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 29 02:13:04 2021 +0000
tree c2cdbaf2dd4d673d619d4c5e04cc8c82aed9fae1
parent 8e9a1a389e2cd44b9ba5f732ba3efb7826a2e0a1
parent c2440a8fbf70cd020b8c5bc7c9e713c33fac36e6

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

stack/btm/btm_ble_bgconn.cc

diff --git a/stack/btm/btm_ble_bgconn.cc b/stack/btm/btm_ble_bgconn.cc
index 80ba1cd..8a70c20 100644
--- a/stack/btm/btm_ble_bgconn.cc
+++ b/stack/btm/btm_ble_bgconn.cc
@@ -364,7 +364,9 @@
   btm_ble_enable_resolving_list_for_platform(BTM_BLE_RL_INIT);
   if (btm_cb.ble_ctr_cb.rl_state != BTM_BLE_RL_IDLE &&
       controller_get_interface()->supports_ble_privacy()) {
+#if (BLE_LOCAL_PRIVACY_ENABLED == TRUE)
     own_addr_type |= BLE_ADDR_TYPE_ID_BIT;
+#endif
     peer_addr_type |= BLE_ADDR_TYPE_ID_BIT;
   }