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

Commit 4f8a4765 authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

Merge "cleanup: no assigns in conditionals" am: 4485bd16 

am: e5f7d4b6

Change-Id: I9ad89e2788b4a95e0f896daa8a6530a313e67ad5
parents 1e36128a e5f7d4b6

system/bta/av/bta_av_aact.cc

+2 −1
Original line number Diff line number Diff line
@@ -1356,7 +1356,8 @@ void bta_av_str_opened(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    open.status = BTA_AV_SUCCESS;

    open.starting = bta_av_chk_start(p_scb);

    open.edr = 0;

    if (NULL != (p = BTM_ReadRemoteFeatures(p_scb->peer_addr))) {

    p = BTM_ReadRemoteFeatures(p_scb->peer_addr);

    if (p != NULL) {

      if (HCI_EDR_ACL_2MPS_SUPPORTED(p)) open.edr |= BTA_AV_EDR_2MBPS;

      if (HCI_EDR_ACL_3MPS_SUPPORTED(p)) open.edr |= BTA_AV_EDR_3MBPS;

    }

system/bta/hd/bta_hd_act.cc

+4 −2
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ void bta_hd_api_enable(tBTA_HD_DATA* p_data) { 
  /* store parameters */

  bta_hd_cb.p_cback = p_data->api_enable.p_cback;



  if ((ret = HID_DevRegister(bta_hd_cback)) == HID_SUCCESS) {

  ret = HID_DevRegister(bta_hd_cback);

  if (ret == HID_SUCCESS) {

    status = BTA_HD_OK;

  } else {

    APPL_TRACE_ERROR("%s: Failed to register HID device (%d)", __func__, ret);
@@ -126,7 +127,8 @@ void bta_hd_api_disable(void) { 
  }



  /* Deregister with lower layer */

  if ((ret = HID_DevDeregister()) == HID_SUCCESS) {

  ret = HID_DevDeregister();

  if (ret == HID_SUCCESS) {

    status = BTA_HD_OK;

  } else {

    APPL_TRACE_ERROR("%s: Failed to deregister HID device (%s)", __func__, ret);

system/bta/hd/bta_hd_api.cc

+83 −120
Original line number Diff line number Diff line
@@ -50,15 +50,13 @@ static const tBTA_SYS_REG bta_hd_reg = {bta_hd_hdl_event, BTA_HdDisable}; 
 *

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

void BTA_HdEnable(tBTA_HD_CBACK* p_cback) {

  tBTA_HD_API_ENABLE* p_buf;



  APPL_TRACE_API("%s", __func__);



  bta_sys_register(BTA_ID_HD, &bta_hd_reg);



  p_buf = (tBTA_HD_API_ENABLE*)osi_malloc((uint16_t)sizeof(tBTA_HD_API_ENABLE));

  tBTA_HD_API_ENABLE* p_buf =

      (tBTA_HD_API_ENABLE*)osi_malloc((uint16_t)sizeof(tBTA_HD_API_ENABLE));



  if (p_buf != NULL) {

  memset(p_buf, 0, sizeof(tBTA_HD_API_ENABLE));



  p_buf->hdr.event = BTA_HD_API_ENABLE_EVT;
@@ -66,7 +64,6 @@ void BTA_HdEnable(tBTA_HD_CBACK* p_cback) { 


  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -78,17 +75,14 @@ void BTA_HdEnable(tBTA_HD_CBACK* p_cback) { 
 *

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

void BTA_HdDisable(void) {

  BT_HDR* p_buf;



  APPL_TRACE_API("%s", __func__);



  bta_sys_deregister(BTA_ID_HD);



  if ((p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR))) != NULL) {

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

  p_buf->event = BTA_HD_API_DISABLE_EVT;

  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -103,12 +97,10 @@ void BTA_HdDisable(void) { 
extern void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info,

                              tBTA_HD_QOS_INFO* p_in_qos,

                              tBTA_HD_QOS_INFO* p_out_qos) {

  tBTA_HD_REGISTER_APP* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (tBTA_HD_REGISTER_APP*)osi_malloc(

           sizeof(tBTA_HD_REGISTER_APP))) != NULL) {

  tBTA_HD_REGISTER_APP* p_buf =

      (tBTA_HD_REGISTER_APP*)osi_malloc(sizeof(tBTA_HD_REGISTER_APP));

  p_buf->hdr.event = BTA_HD_API_REGISTER_APP_EVT;



  if (p_app_info->p_name) {
@@ -145,7 +137,6 @@ extern void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info, 


  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -158,16 +149,13 @@ extern void BTA_HdRegisterApp(tBTA_HD_APP_INFO* p_app_info, 
 *

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

extern void BTA_HdUnregisterApp(void) {

  BT_HDR* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR))) != NULL) {

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

  p_buf->event = BTA_HD_API_UNREGISTER_APP_EVT;



  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -179,8 +167,6 @@ extern void BTA_HdUnregisterApp(void) { 
 *

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

extern void BTA_HdSendReport(tBTA_HD_REPORT* p_report) {

  tBTA_HD_SEND_REPORT* p_buf;



  APPL_TRACE_VERBOSE("%s", __func__);



  if (p_report->len > BTA_HD_REPORT_LEN) {
@@ -191,8 +177,8 @@ extern void BTA_HdSendReport(tBTA_HD_REPORT* p_report) { 
    return;

  }



  if ((p_buf = (tBTA_HD_SEND_REPORT*)osi_malloc(sizeof(tBTA_HD_SEND_REPORT))) !=

      NULL) {

  tBTA_HD_SEND_REPORT* p_buf =

      (tBTA_HD_SEND_REPORT*)osi_malloc(sizeof(tBTA_HD_SEND_REPORT));

  p_buf->hdr.event = BTA_HD_API_SEND_REPORT_EVT;



  p_buf->use_intr = p_report->use_intr;
@@ -203,7 +189,6 @@ extern void BTA_HdSendReport(tBTA_HD_REPORT* p_report) { 


  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -215,16 +200,13 @@ extern void BTA_HdSendReport(tBTA_HD_REPORT* p_report) { 
 *

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

extern void BTA_HdVirtualCableUnplug(void) {

  BT_HDR* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR))) != NULL) {

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

  p_buf->event = BTA_HD_API_VC_UNPLUG_EVT;



  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -237,19 +219,16 @@ extern void BTA_HdVirtualCableUnplug(void) { 
 *

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

extern void BTA_HdConnect(BD_ADDR addr) {

  tBTA_HD_DEVICE_CTRL* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL))) !=

      NULL) {

  tBTA_HD_DEVICE_CTRL* p_buf =

      (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL));

  p_buf->hdr.event = BTA_HD_API_CONNECT_EVT;



  memcpy(p_buf->addr, addr, sizeof(BD_ADDR));



  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -261,16 +240,12 @@ extern void BTA_HdConnect(BD_ADDR addr) { 
 *

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

extern void BTA_HdDisconnect(void) {

  BT_HDR* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR))) != NULL) {

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

  p_buf->event = BTA_HD_API_DISCONNECT_EVT;



  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -282,19 +257,15 @@ extern void BTA_HdDisconnect(void) { 
 *

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

extern void BTA_HdAddDevice(BD_ADDR addr) {

  tBTA_HD_DEVICE_CTRL* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL))) !=

      NULL) {

  tBTA_HD_DEVICE_CTRL* p_buf =

      (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL));

  p_buf->hdr.event = BTA_HD_API_ADD_DEVICE_EVT;



  memcpy(p_buf->addr, addr, sizeof(BD_ADDR));



  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -306,19 +277,15 @@ extern void BTA_HdAddDevice(BD_ADDR addr) { 
 *

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

extern void BTA_HdRemoveDevice(BD_ADDR addr) {

  tBTA_HD_DEVICE_CTRL* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL))) !=

      NULL) {

  tBTA_HD_DEVICE_CTRL* p_buf =

      (tBTA_HD_DEVICE_CTRL*)osi_malloc(sizeof(tBTA_HD_DEVICE_CTRL));

  p_buf->hdr.event = BTA_HD_API_REMOVE_DEVICE_EVT;



  memcpy(p_buf->addr, addr, sizeof(BD_ADDR));



  bta_sys_sendmsg(p_buf);

}

}



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

 *
@@ -330,17 +297,13 @@ extern void BTA_HdRemoveDevice(BD_ADDR addr) { 
 *

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

extern void BTA_HdReportError(uint8_t error) {

  tBTA_HD_REPORT_ERR* p_buf;



  APPL_TRACE_API("%s", __func__);



  if ((p_buf = (tBTA_HD_REPORT_ERR*)osi_malloc(sizeof(tBTA_HD_REPORT_ERR))) !=

      NULL) {

  tBTA_HD_REPORT_ERR* p_buf =

      (tBTA_HD_REPORT_ERR*)osi_malloc(sizeof(tBTA_HD_REPORT_ERR));

  p_buf->hdr.event = BTA_HD_API_REPORT_ERROR_EVT;

  p_buf->error = error;



  bta_sys_sendmsg(p_buf);

}

}



#endif /* BTA_HD_INCLUDED */

system/bta/hd/bta_hd_main.cc

+2 −1
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ void bta_hd_sm_execute(uint16_t event, tBTA_HD_DATA* p_data) { 


  event &= 0xff;



  if ((action = state_table[event][BTA_HD_ACTION]) < BTA_HD_IGNORE) {

  action = state_table[event][BTA_HD_ACTION];

  if (action < BTA_HD_IGNORE) {

    (*bta_hd_action[action])(p_data);

  }

system/bta/hf_client/bta_hf_client_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -581,8 +581,8 @@ tBTA_HF_CLIENT_CB* bta_hf_client_find_cb_by_sco_handle(uint16_t handle) { 
 *

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

bool bta_hf_client_allocate_handle(const BD_ADDR bd_addr, uint16_t* p_handle) {

  tBTA_HF_CLIENT_CB* existing_cb;

  if ((existing_cb = bta_hf_client_find_cb_by_bda(bd_addr)) != NULL) {

  tBTA_HF_CLIENT_CB* existing_cb = bta_hf_client_find_cb_by_bda(bd_addr);

  if (existing_cb != NULL) {

    BTIF_TRACE_ERROR("%s: cannot allocate handle since BDADDR already exists",

                     __func__);

    return false;