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

Commit 414fc16b authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

IA2: Use proper types API tBTA_SYS_ID am: 48256646 am: 5cd340f7 am: fac047cd am: b0bd0e72 

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



Change-Id: I5d3df0f5d7cfd88af971b20b8611c0baf11f0d54
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44e41ff9 b0bd0e72

system/bta/ag/bta_ag_int.h

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ void bta_ag_sm_execute(tBTA_AG_SCB* p_scb, uint16_t event, 
                       const tBTA_AG_DATA& data);

void bta_ag_sm_execute_by_handle(uint16_t handle, uint16_t event,

                                 const tBTA_AG_DATA& data);

void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,

void bta_ag_collision_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id,

                            uint8_t app_id, const RawAddress& peer_addr);

void bta_ag_resume_open(tBTA_AG_SCB* p_scb);

system/bta/ag/bta_ag_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -346,8 +346,8 @@ bool bta_ag_scb_open(tBTA_AG_SCB* p_curr_scb) { 
 * Returns          void

 *

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

void bta_ag_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, uint8_t id,

                            UNUSED_ATTR uint8_t app_id,

void bta_ag_collision_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status,

                            tBTA_SYS_ID id, UNUSED_ATTR uint8_t app_id,

                            const RawAddress& peer_addr) {

  /* Check if we have opening scb for the peer device. */

  uint16_t handle = bta_ag_idx_by_bdaddr(&peer_addr);

system/bta/av/bta_av_main.cc

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "bta/include/bta_ar_api.h"

#include "bta/include/bta_av_co.h"

#include "bta/include/utl.h"

#include "bta/sys/bta_sys.h"

#include "btif/avrcp/avrcp_service.h"

#include "btif/include/btif_av.h"

#include "btif/include/btif_av_co.h"

system/bta/dm/bta_dm_act.cc

+4 −4
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data); 
static void bta_dm_set_eir(char* local_name);



static void bta_dm_disable_conn_down_timer_cback(void* data);

void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app_id,

                     const RawAddress& peer_addr);

static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id,

                            uint8_t app_id, const RawAddress& peer_addr);

static void bta_dm_adjust_roles(bool delay_role_switch);

static void bta_dm_bond_cancel_complete_cback(tBTM_STATUS result);
@@ -1453,8 +1453,8 @@ static void bta_dm_disable_conn_down_timer_cback(UNUSED_ATTR void* data) { 
 * Returns          void

 *

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

void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id, uint8_t app_id,

                     const RawAddress& peer_addr) {

static void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id,

                            uint8_t app_id, const RawAddress& peer_addr) {

  uint8_t j;

  tBTA_PREF_ROLES role;

  tBTA_DM_PEER_DEVICE* p_dev;

system/bta/hf_client/bta_hf_client_int.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ void bta_hf_client_slc_seq(tBTA_HF_CLIENT_CB* client_cb, bool error); 
bool bta_hf_client_allocate_handle(const RawAddress& bd_addr,

                                   uint16_t* p_handle);

void bta_hf_client_app_callback(uint16_t event, tBTA_HF_CLIENT* data);

void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,

void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS status, tBTA_SYS_ID id,

                                   uint8_t app_id, const RawAddress& peer_addr);

void bta_hf_client_resume_open(tBTA_HF_CLIENT_CB* client_cb);

tBTA_STATUS bta_hf_client_api_enable(tBTA_HF_CLIENT_CBACK* p_cback,