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

Commit 830f0e29 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Return bool=>void stack/btm/btm_ble::BTM_SecAddBleDevice am: 0a9344e1 am:... 

Return bool=>void stack/btm/btm_ble::BTM_SecAddBleDevice am: 0a9344e1 am: 8193e7a4 am: afe7239b am: c9fb2737

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

Change-Id: Idb1c50e78103075660cb30387be6e165fc270538
parents 07d7c89a c9fb2737

system/bta/dm/bta_dm_act.cc

+1 −3
Original line number Diff line number Diff line
@@ -3409,9 +3409,7 @@ void bta_dm_add_blekey(const RawAddress& bd_addr, tBTA_LE_KEY_VALUE blekey, 
 ******************************************************************************/

void bta_dm_add_ble_device(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,

                           tBT_DEVICE_TYPE dev_type) {

  if (!BTM_SecAddBleDevice(bd_addr, dev_type, addr_type)) {

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

  }

  BTM_SecAddBleDevice(bd_addr, dev_type, addr_type);

}



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

system/main/shim/btm_api.cc

+1 −2
Original line number Diff line number Diff line
@@ -908,11 +908,10 @@ uint8_t bluetooth::shim::BTM_GetEirUuidList(uint8_t* p_eir, size_t eir_len, 
  return 0;

}



bool bluetooth::shim::BTM_SecAddBleDevice(const RawAddress& bd_addr,

void bluetooth::shim::BTM_SecAddBleDevice(const RawAddress& bd_addr,

                                          tBT_DEVICE_TYPE dev_type,

                                          tBLE_ADDR_TYPE addr_type) {

  LOG_INFO("UNIMPLEMENTED %s", __func__);

  return false;

}



bool bluetooth::shim::BTM_SecAddBleKey(const RawAddress& bd_addr,

system/main/shim/btm_api.h

+1 −3
Original line number Diff line number Diff line
@@ -397,10 +397,8 @@ uint8_t BTM_GetEirUuidList(uint8_t* p_eir, size_t eir_len, uint8_t uuid_size, 
 *                  dev_type         - Remote device's device type.

 *                  addr_type        - LE device address type.

 *

 * Returns          true if added OK, else false

 *

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

bool BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type,

void BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type,

                         tBLE_ADDR_TYPE addr_type);



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

system/stack/btm/btm_ble.cc

+1 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ extern void gatt_notify_phy_updated(tGATT_STATUS status, uint16_t handle, 
/******************************************************************************/

/* External Function to be called by other modules                            */

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

bool BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type,

void BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type,

                         tBLE_ADDR_TYPE addr_type) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::BTM_SecAddBleDevice(bd_addr, dev_type, addr_type);
@@ -94,8 +94,6 @@ bool BTM_SecAddBleDevice(const RawAddress& bd_addr, tBT_DEVICE_TYPE dev_type, 
    BTM_TRACE_DEBUG("InqDb  device_type =0x%x  addr_type=0x%x",

                    p_info->results.device_type, p_info->results.ble_addr_type);

  }



  return true;

}



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

system/stack/include/btm_ble_api.h

+1 −3
Original line number Diff line number Diff line
@@ -50,10 +50,8 @@ 
 *                  dev_type         - Remote device's device type.

 *                  addr_type        - LE device address type.

 *

 * Returns          true if added OK, else false

 *

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

extern bool BTM_SecAddBleDevice(const RawAddress& bd_addr,

extern void BTM_SecAddBleDevice(const RawAddress& bd_addr,

                                tBT_DEVICE_TYPE dev_type,

                                tBLE_ADDR_TYPE addr_type);