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

Commit 93183cf6 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "[Invisalign2] use get_btm_client_interface() to call BTM_SecAddBleDevice" into main

parents d6a6c6b0 22b2b92b

system/btif/src/btif_dm.cc

+3 −1
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_ble_sec_api.h"

#include "stack/include/btm_ble_sec_api_types.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/btm_sec_api.h"

#include "stack/include/btm_sec_api_types.h"
@@ -2655,7 +2656,8 @@ void btif_dm_create_bond_out_of_band(const RawAddress bd_addr, 
          break;

      }

      pairing_cb.is_local_initiated = true;

      BTM_SecAddBleDevice(bd_addr, BT_DEVICE_TYPE_BLE, address_type);

      get_btm_client_interface().security.BTM_SecAddBleDevice(

          bd_addr, BT_DEVICE_TYPE_BLE, address_type);

      BTA_DmBond(bd_addr, address_type, transport, BT_DEVICE_TYPE_BLE);

      break;

    }

system/stack/btm/btm_ble_batchscan.cc

+4 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "device/include/controller.h"

#include "os/log.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/btm_ble_sec_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btu_hcif.h"



extern tBTM_CB btm_cb;
@@ -153,7 +153,8 @@ void btm_ble_batchscan_filter_track_adv_vse_cback(uint8_t len, 
                adv_data.addr_type, adv_data.advertiser_state);



    // Make sure the device is known

    BTM_SecAddBleDevice(adv_data.bd_addr, BT_DEVICE_TYPE_BLE,

    get_btm_client_interface().security.BTM_SecAddBleDevice(

        adv_data.bd_addr, BT_DEVICE_TYPE_BLE,

        to_ble_addr_type(adv_data.addr_type));



    ble_advtrack_cb.p_track_cback(&adv_data);