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

Commit ca99d11c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clear identity bit when passing address to filter" am: a8dd4665 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2589946



Change-Id: Id3c5618b45ed96f4248ed4ad4ad9624fe4fb058c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4229af1 a8dd4665

system/stack/btm/btm_ble_adv_filter.cc

+3 −2
Original line number 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: {

        tBLE_BD_ADDR target_addr;

        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,

                              base::DoNothing());
@@ -688,7 +688,8 @@ 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 = 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;

          // Add it to the union to pass to SecAddBleKey

          tBTM_LE_KEY_VALUE le_key;