Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8dd4665 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Clear identity bit when passing address to filter"

parents ad20b1a0 08196628

system/stack/btm/btm_ble_adv_filter.cc

+3 −2
Original line number Original line Diff line number Diff line
@@ -648,7 +648,7 @@ void BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index, 
      case BTM_BLE_PF_ADDR_FILTER: {

      case BTM_BLE_PF_ADDR_FILTER: {

        tBLE_BD_ADDR target_addr;

        tBLE_BD_ADDR target_addr;

        target_addr.bda = cmd.address;

        target_addr.bda = cmd.address;

        target_addr.type = to_ble_addr_type(cmd.addr_type);

        target_addr.type = (cmd.addr_type & (~BLE_ADDR_TYPE_ID_BIT));





        BTM_LE_PF_addr_filter(action, filt_index, target_addr,

        BTM_LE_PF_addr_filter(action, filt_index, target_addr,

                              base::DoNothing());

                              base::DoNothing());
@@ -688,7 +688,8 @@ void BTM_LE_PF_set(tBTM_BLE_PF_FILT_INDEX filt_index, 
          // Set the IRK

          // Set the IRK

          tBTM_LE_PID_KEYS pid_keys;

          tBTM_LE_PID_KEYS pid_keys;

          pid_keys.irk = cmd.irk;

          pid_keys.irk = cmd.irk;

          pid_keys.identity_addr_type = to_ble_addr_type(cmd.addr_type);

          pid_keys.identity_addr_type =

              (cmd.addr_type & (~BLE_ADDR_TYPE_ID_BIT));

          pid_keys.identity_addr = cmd.address;

          pid_keys.identity_addr = cmd.address;

          // Add it to the union to pass to SecAddBleKey

          // Add it to the union to pass to SecAddBleKey

          tBTM_LE_KEY_VALUE le_key;

          tBTM_LE_KEY_VALUE le_key;