Allow Resolvable Private Address into LE White List
When doing background connection, we don't want to put RPA into the
white list, as it might expire in 15 minutes.
For direct connect procedure, RPA is ok - the request times out after 30
seconds.
This patch moves address type check from the White List to the background
connection procedure. It is prepearation for handling direct connect
with white list.
Bug: 112827989
Test: sl4a GattConnectTest
Change-Id: I907ad44d1d255c9212ed58112bb8b99464e46f43
diff --git a/stack/btm/btm_ble_bgconn.cc b/stack/btm/btm_ble_bgconn.cc
index af3b44e..0236ed7 100644
--- a/stack/btm/btm_ble_bgconn.cc
+++ b/stack/btm/btm_ble_bgconn.cc
@@ -154,6 +154,30 @@
}
}
+bool BTM_BackgroundConnectAddressKnown(const RawAddress& address) {
+ tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(address);
+
+ // not a known device, or a classic device, we assume public address
+ if (p_dev_rec == NULL || (p_dev_rec->device_type & BT_DEVICE_TYPE_BLE) == 0)
+ return true;
+
+ // bonded device with identity address known
+ if (p_dev_rec->ble.identity_addr != address &&
+ !p_dev_rec->ble.identity_addr.IsEmpty()) {
+ return true;
+ }
+
+ // Public address, Random Static, or Random Non-Resolvable Address known
+ if (p_dev_rec->ble.ble_addr_type == BLE_ADDR_PUBLIC ||
+ !BTM_BLE_IS_RESOLVE_BDA(address)) {
+ return true;
+ }
+
+ // Only Resolvable Private Address (RPA) is known, we don't allow it into
+ // the background connection procedure.
+ return false;
+}
+
/*******************************************************************************
*
* Function btm_add_dev_to_controller
@@ -162,33 +186,34 @@
******************************************************************************/
bool btm_add_dev_to_controller(bool to_add, const RawAddress& bd_addr) {
tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);
- bool started = false;
if (p_dev_rec != NULL && p_dev_rec->device_type & BT_DEVICE_TYPE_BLE) {
if (to_add) {
- if (p_dev_rec->ble.ble_addr_type == BLE_ADDR_PUBLIC ||
- !BTM_BLE_IS_RESOLVE_BDA(bd_addr)) {
- background_connection_add(p_dev_rec->ble.ble_addr_type, bd_addr);
- started = true;
- p_dev_rec->ble.in_controller_list |= BTM_WHITE_LIST_BIT;
- } else if (p_dev_rec->ble.identity_addr != bd_addr &&
- !p_dev_rec->ble.identity_addr.IsEmpty()) {
+ if (p_dev_rec->ble.identity_addr != bd_addr &&
+ !p_dev_rec->ble.identity_addr.IsEmpty()) {
background_connection_add(p_dev_rec->ble.identity_addr_type,
p_dev_rec->ble.identity_addr);
- started = true;
- p_dev_rec->ble.in_controller_list |= BTM_WHITE_LIST_BIT;
- }
- } else {
- if (p_dev_rec->ble.ble_addr_type == BLE_ADDR_PUBLIC ||
- !BTM_BLE_IS_RESOLVE_BDA(bd_addr)) {
- background_connection_remove(bd_addr);
- started = true;
+ } else {
+ background_connection_add(p_dev_rec->ble.ble_addr_type, bd_addr);
+
+ if (p_dev_rec->ble.ble_addr_type == BLE_ADDR_RANDOM &&
+ BTM_BLE_IS_RESOLVE_BDA(bd_addr)) {
+ LOG(INFO) << __func__ << " addig RPA into white list";
+ }
}
+ p_dev_rec->ble.in_controller_list |= BTM_WHITE_LIST_BIT;
+ } else {
if (!p_dev_rec->ble.identity_addr.IsEmpty() &&
p_dev_rec->ble.identity_addr != bd_addr) {
background_connection_remove(p_dev_rec->ble.identity_addr);
- started = true;
+ } else {
+ background_connection_remove(bd_addr);
+
+ if (p_dev_rec->ble.ble_addr_type == BLE_ADDR_RANDOM &&
+ BTM_BLE_IS_RESOLVE_BDA(bd_addr)) {
+ LOG(INFO) << __func__ << " removing RPA from white list";
+ }
}
p_dev_rec->ble.in_controller_list &= ~BTM_WHITE_LIST_BIT;
@@ -196,14 +221,13 @@
} else {
/* not a known device, i.e. attempt to connect to device never seen before
*/
- started = true;
if (to_add)
background_connection_add(BLE_ADDR_PUBLIC, bd_addr);
else
background_connection_remove(bd_addr);
}
- return started;
+ return true;
}
/** White list add complete */
diff --git a/stack/gatt/gatt_api.cc b/stack/gatt/gatt_api.cc
index 3b6b59b..ae7af8c 100644
--- a/stack/gatt/gatt_api.cc
+++ b/stack/gatt/gatt_api.cc
@@ -36,6 +36,7 @@
using bluetooth::Uuid;
+extern bool BTM_BackgroundConnectAddressKnown(const RawAddress& address);
/**
* Add an service handle range to the list in decending order of the start
* handle. Return reference to the newly added element.
@@ -1117,7 +1118,15 @@
if (is_direct) {
ret = gatt_act_connect(p_reg, bd_addr, transport, initiating_phys);
} else {
- ret = gatt::connection_manager::background_connect_add(gatt_if, bd_addr);
+ if (!BTM_BackgroundConnectAddressKnown(bd_addr)) {
+ // RPA can rotate, and cause device to "expire" in the background
+ // connection list. RPA is allowed for direct connect, as such request
+ // times out after 30 seconds
+ LOG(INFO) << "Can't add RPA to background connection.";
+ ret = true;
+ } else {
+ ret = gatt::connection_manager::background_connect_add(gatt_if, bd_addr);
+ }
}
tGATT_TCB* p_tcb = gatt_find_tcb_by_addr(bd_addr, transport);
