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

Commit 90a76a36 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7302914 from f940dc7d to sc-release 

Change-Id: I0feb0b0201bfdf312cf82bc65aad1561a55f1f2b
parents fcda400d f940dc7d

system/bta/ag/bta_ag_int.h

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ extern const tBTA_AG_HF_IND bta_ag_local_hf_ind_cfg[]; 
/*****************************************************************************

 *  Function prototypes

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

bool bta_ag_hdl_event(BT_HDR* p_msg);

bool bta_ag_hdl_event(BT_HDR_RIGID* p_msg);



/* API functions */

extern void bta_ag_api_enable(tBTA_AG_CBACK* p_cback);

system/bta/ag/bta_ag_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ void bta_ag_sm_execute_by_handle(uint16_t handle, uint16_t event, 
 * @param p_msg event message

 * @return True to free p_msg, or False if p_msg is freed within this function

 */

bool bta_ag_hdl_event(BT_HDR* p_msg) {

bool bta_ag_hdl_event(BT_HDR_RIGID* p_msg) {

  switch (p_msg->event) {

    case BTA_AG_RING_TIMEOUT_EVT:

    case BTA_AG_SVC_TIMEOUT_EVT:

system/bta/av/bta_av_aact.cc

+1 −1
Original line number Diff line number Diff line
@@ -2183,7 +2183,7 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  bool initiator = false;

  bool suspend = false;

  uint8_t new_role = p_scb->role;

  BT_HDR hdr;

  BT_HDR_RIGID hdr;

  tHCI_ROLE cur_role;

  uint8_t local_tsep = p_scb->seps[p_scb->sep_idx].tsep;

system/bta/av/bta_av_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void bta_av_del_sdp_rec(uint32_t* p_sdp_handle) { 
 *

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

static void bta_av_avrc_sdp_cback(UNUSED_ATTR uint16_t status) {

  BT_HDR* p_msg = (BT_HDR*)osi_malloc(sizeof(BT_HDR));

  BT_HDR_RIGID* p_msg = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID));



  p_msg->event = BTA_AV_SDP_AVRC_DISC_EVT;
@@ -1291,7 +1291,7 @@ void bta_av_conn_chg(tBTA_AV_DATA* p_data) { 
 *

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

void bta_av_disable(tBTA_AV_CB* p_cb, UNUSED_ATTR tBTA_AV_DATA* p_data) {

  BT_HDR hdr;

  BT_HDR_RIGID hdr;

  bool disabling_in_progress = false;

  uint16_t xx;

system/bta/av/bta_av_api.cc

+5 −5
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ void BTA_AvEnable(tBTA_AV_FEAT features, tBTA_AV_CBACK* p_cback) { 
 *

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

void BTA_AvDisable(void) {

  BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));

  BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID));



  bta_sys_deregister(BTA_ID_AV);

  p_buf->event = BTA_AV_API_DISABLE_EVT;
@@ -126,7 +126,7 @@ void BTA_AvRegister(tBTA_AV_CHNL chnl, const char* p_service_name, 
 *

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

void BTA_AvDeregister(tBTA_AV_HNDL hndl) {

  BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));

  BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID));



  p_buf->layer_specific = hndl;

  p_buf->event = BTA_AV_API_DEREGISTER_EVT;
@@ -176,7 +176,7 @@ void BTA_AvOpen(const RawAddress& bd_addr, tBTA_AV_HNDL handle, bool use_rc, 
void BTA_AvClose(tBTA_AV_HNDL handle) {

  LOG_INFO("%s: bta_handle:0x%x", __func__, handle);



  BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));

  BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID));



  p_buf->event = BTA_AV_API_CLOSE_EVT;

  p_buf->layer_specific = handle;
@@ -217,7 +217,7 @@ void BTA_AvDisconnect(const RawAddress& bd_addr) { 
void BTA_AvStart(tBTA_AV_HNDL handle) {

  LOG_INFO("Starting audio/video stream data transfer bta_handle:%hhu", handle);



  BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));

  BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID));



  p_buf->event = BTA_AV_API_START_EVT;

  p_buf->layer_specific = handle;
@@ -237,7 +237,7 @@ void BTA_AvStart(tBTA_AV_HNDL handle) { 
void BTA_AvOffloadStart(tBTA_AV_HNDL hndl) {

  LOG_INFO("%s: bta_handle=0x%x", __func__, hndl);



  BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));

  BT_HDR_RIGID* p_buf = (BT_HDR_RIGID*)osi_malloc(sizeof(BT_HDR_RIGID));



  p_buf->event = BTA_AV_API_OFFLOAD_START_EVT;

  p_buf->layer_specific = hndl;