diff options
| author | Martin Brabham <optedoblivion@google.com> | 2021-12-14 21:07:03 +0000 |
|---|---|---|
| committer | Martin Brabham <optedoblivion@google.com> | 2021-12-16 23:18:50 +0000 |
| commit | 70d7e7d21603bbcab90d6ba1ab14299708811193 (patch) | |
| tree | 4d8a79162210d3a83fefacf194d3e264da350394 | |
| parent | a90e1ef71d87fb8fec91c06ea864bd7c6c0827e3 (diff) | |
| download | bt-70d7e7d21603bbcab90d6ba1ab14299708811193.tar.gz | |
Revert "Clear identity bit when passing address to filter"
This reverts commit a3eec6ddb6ae5c393f5b99398862e02ff0cb0682.
Ignore-AOSP-First: Need on sc-v2-dev; code doesn't match on master
Bug: 209885517
Test: Manual; gd/cert/run --device --clean --test_config=gd/cert/gd_sl4a_device_config.json LeAdvancedScanningTest
Tag: #stability
Change-Id: I52551649d25569397c1b1dc013eb0e6b4386fad2
| -rw-r--r-- | stack/btm/btm_ble_adv_filter.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/stack/btm/btm_ble_adv_filter.cc b/stack/btm/btm_ble_adv_filter.cc index 7f0619bf6..c84549ddf 100644 --- a/stack/btm/btm_ble_adv_filter.cc +++ b/stack/btm/btm_ble_adv_filter.cc @@ -639,7 +639,7 @@ void BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index, case BTM_BLE_PF_ADDR_FILTER: { tBLE_BD_ADDR target_addr; target_addr.bda = cmd.address; - target_addr.type = (cmd.addr_type & (~BLE_ADDR_TYPE_ID_BIT)); + target_addr.type = cmd.addr_type; BTM_LE_PF_addr_filter(action, filt_index, target_addr, base::DoNothing()); @@ -679,8 +679,7 @@ void BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index, // Set the IRK tBTM_LE_PID_KEYS pid_keys; pid_keys.irk = cmd.irk; - pid_keys.identity_addr_type = - (cmd.addr_type & (~BLE_ADDR_TYPE_ID_BIT)); + pid_keys.identity_addr_type = cmd.addr_type; pid_keys.identity_addr = cmd.address; // Add it to the union to pass to SecAddBleKey tBTM_LE_KEY_VALUE le_key; |