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

diff --git a/stack/btm/btm_ble_adv_filter.cc b/stack/btm/btm_ble_adv_filter.cc
index 7f0619b..c84549d 100644 (file)
--- 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;