commit 96abd3b3dc15c20a21f373727adcb5ab6bf4b365
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 29 03:51:04 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 29 03:51:04 2021 +0000
tree e41d6f242789b40aafc8547e9059786466e6a421
parent a1c1815711ae06def1fc25ff8270e2ba0596abdf
parent 70370e09c3bd1e2f52dd0571d13d0cbe34c44c9f

Merge "legacy: Use get_btm_client_interface().eir.BTM_GetEirUuidList"

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;
   }
 

types/raw_address.h

diff --git a/types/raw_address.h b/types/raw_address.h
index 8f5b8dc..b3e7530 100644
--- a/types/raw_address.h
+++ b/types/raw_address.h
@@ -88,6 +88,12 @@
     *(p)++ = (uint8_t)(a.address)[BD_ADDR_LEN - 1 - ijk];
 }
 
+inline void STREAM_TO_BDADDR(RawAddress& a, const uint8_t*& p) {
+  uint8_t* pbda = (uint8_t*)(a.address) + BD_ADDR_LEN - 1;
+  for (int ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *(p)++;
+}
+
+// DEPRECATED
 inline void STREAM_TO_BDADDR(RawAddress& a, uint8_t*& p) {
   uint8_t* pbda = (uint8_t*)(a.address) + BD_ADDR_LEN - 1;
   for (int ijk = 0; ijk < BD_ADDR_LEN; ijk++) *pbda-- = *(p)++;