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

Commit 0627c509 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Replace tBTA_LE_KEY_TYPE=>tBTM_LE_KEY_TYPE am: 004c6825 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1448163

Change-Id: Id8ee2396961663244c7b1de5ff6f5f5a8536eb3c
parents 80f0828d 004c6825

system/bta/dm/bta_dm_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -3206,8 +3206,8 @@ static void bta_dm_observe_cmpl_cb(void* p_result) { 


static void ble_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap,

                       tBTM_OOB_DATA* p_oob_data, tBTM_LE_AUTH_REQ* p_auth_req,

                       uint8_t* p_max_key_size, tBTA_LE_KEY_TYPE* p_init_key,

                       tBTA_LE_KEY_TYPE* p_resp_key) {

                       uint8_t* p_max_key_size, tBTM_LE_KEY_TYPE* p_init_key,

                       tBTM_LE_KEY_TYPE* p_resp_key) {

  bte_appl_cfg.ble_io_cap = btif_storage_get_local_io_caps_ble();



  /* Retrieve the properties from file system if possible */
@@ -3423,7 +3423,7 @@ static void bta_dm_ble_id_key_cback(uint8_t key_type, 
 *

 ******************************************************************************/

void bta_dm_add_blekey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE blekey,

                       tBTA_LE_KEY_TYPE key_type) {

                       tBTM_LE_KEY_TYPE key_type) {

  if (!BTM_SecAddBleKey(bd_addr, (tBTM_LE_KEY_VALUE*)&blekey, key_type)) {

    LOG(ERROR) << "BTA_DM: Error adding BLE Key for device " << bd_addr;

  }

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info, 
 *

 ******************************************************************************/

void BTA_DmAddBleKey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE* p_le_key,

                     tBTA_LE_KEY_TYPE key_type) {

                     tBTM_LE_KEY_TYPE key_type) {

  do_in_main_thread(

      FROM_HERE, base::Bind(bta_dm_add_blekey, bd_addr, *p_le_key, key_type));

}

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ extern void bta_dm_add_ampkey(tBTA_DM_MSG* p_data); 


extern void bta_dm_add_blekey(const RawAddress& bd_addr,

                              tBTA_LE_KEY_VALUE blekey,

                              tBTA_LE_KEY_TYPE key_type);

                              tBTM_LE_KEY_TYPE key_type);

extern void bta_dm_add_ble_device(const RawAddress& bd_addr,

                                  tBLE_ADDR_TYPE addr_type,

                                  tBT_DEVICE_TYPE dev_type);

system/bta/include/bta_api.h

+1 −1
Original line number Diff line number Diff line
@@ -968,7 +968,7 @@ extern void BTA_DmAddBleDevice(const RawAddress& bd_addr, 
 ******************************************************************************/

extern void BTA_DmAddBleKey(const RawAddress& bd_addr,

                            tBTA_LE_KEY_VALUE* p_le_key,

                            tBTA_LE_KEY_TYPE key_type);

                            tBTM_LE_KEY_TYPE key_type);



/*******************************************************************************

 *

system/bta/include/bta_dm_co.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ extern void bta_dm_sco_co_in_data(BT_HDR* p_buf, tBTM_SCO_DATA_FLAG status); 
extern void bta_dm_co_ble_io_req(

    const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap, tBTM_OOB_DATA* p_oob_data,

    tBTM_LE_AUTH_REQ* p_auth_req, uint8_t* p_max_key_size,

    tBTA_LE_KEY_TYPE* p_init_key, tBTA_LE_KEY_TYPE* p_resp_key);

    tBTM_LE_KEY_TYPE* p_init_key, tBTM_LE_KEY_TYPE* p_resp_key);



/*******************************************************************************

 *