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

Commit c8ceab41 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge "Change LE advertisement data length type (uint8_t -> uint16_t)" 

am: 7f412f36

Change-Id: Iecf2d0e338ec4d30aebbe8c385925076ab630a3c
parents e046772d 7f412f36

system/bta/dm/bta_dm_act.cc

+4 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#endif



static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, uint8_t* p_eir,

                                  uint8_t eir_len);

                                  uint16_t eir_len);

static void bta_dm_inq_cmpl_cb(void* p_result);

static void bta_dm_service_search_remname_cback(BD_ADDR bd_addr, DEV_CLASS dc,

                                                BD_NAME bd_name);
@@ -146,7 +146,7 @@ static void bta_dm_ctrl_features_rd_cmpl_cback(tBTM_STATUS result); 
static void bta_dm_reset_sec_dev_pending(BD_ADDR remote_bd_addr);

static void bta_dm_remove_sec_dev_entry(BD_ADDR remote_bd_addr);

static void bta_dm_observe_results_cb(tBTM_INQ_RESULTS* p_inq, uint8_t* p_eir,

                                      uint8_t eir_len);

                                      uint16_t eir_len);

static void bta_dm_observe_cmpl_cb(void* p_result);

static void bta_dm_delay_role_switch_cback(void* data);

static void bta_dm_disable_timer_cback(void* data);
@@ -2223,7 +2223,7 @@ static void bta_dm_sdp_callback(uint16_t sdp_status) { 
 *

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

static void bta_dm_inq_results_cb(tBTM_INQ_RESULTS* p_inq, uint8_t* p_eir,

                                  uint8_t eir_len) {

                                  uint16_t eir_len) {

  tBTA_DM_SEARCH result;

  tBTM_INQ_INFO* p_inq_info;

  uint16_t service_class;
@@ -3935,7 +3935,7 @@ bool bta_dm_check_if_only_hd_connected(BD_ADDR peer_addr) { 
 *

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

static void bta_dm_observe_results_cb(tBTM_INQ_RESULTS* p_inq, uint8_t* p_eir,

                                      uint8_t eir_len) {

                                      uint16_t eir_len) {

  tBTA_DM_SEARCH result;

  tBTM_INQ_INFO* p_inq_info;

  APPL_TRACE_DEBUG("bta_dm_observe_results_cb");

system/bta/include/bta_api.h

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ typedef struct { 
  bool is_limited; /* true, if the limited inquiry bit is set in the CoD */

  int8_t rssi;     /* The rssi value */

  uint8_t* p_eir;  /* received EIR */

  uint8_t eir_len; /* received EIR length */

  uint16_t eir_len; /* received EIR length */

  uint8_t inq_result_type;

  uint8_t ble_addr_type;

  uint16_t ble_evt_type;

system/stack/include/btm_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ typedef void(tBTM_INQ_DB_CHANGE_CB)(void* p1, bool is_new); 
 * First param is inquiry results database, second is pointer of EIR.

*/

typedef void(tBTM_INQ_RESULTS_CB)(tBTM_INQ_RESULTS* p_inq_results,

                                  uint8_t* p_eir, uint8_t eir_len);

                                  uint8_t* p_eir, uint16_t eir_len);



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

 *  ACL CHANNEL MANAGEMENT