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

Commit 6a7e1ac8 authored by Myles Watson's avatar Myles Watson
Browse files

Use unary operator instead of == bool 

Automatically generated with coccinelle:

@@
expression e1;
@@

-e1 == false
+!e1

@@
expression e1;
@@

-false == e1
+!e1

@@
expression e1;
@@

-e1 == true
+e1

@@
expression e1;
@@

-true == e1
+e1

Test: build
Change-Id: Ic7df0dc43b550594855e457466b6bccd8f3443a3
parent 4bf18b74

system/bta/ag/bta_ag_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ void bta_ag_rfc_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
  (*bta_ag_cb.p_cback)(BTA_AG_CLOSE_EVT, (tBTA_AG*)&close);



  /* if not deregistering (deallocating) reopen registered servers */

  if (p_scb->dealloc == false) {

  if (!p_scb->dealloc) {

    /* Clear peer bd_addr so instance can be reused */

    p_scb->peer_addr = RawAddress::kEmpty;

system/bta/ag/bta_ag_cmd.cc

+9 −10
Original line number Diff line number Diff line
@@ -321,39 +321,39 @@ static void bta_ag_send_ind(tBTA_AG_SCB* p_scb, uint16_t id, uint16_t value, 
  /* Ensure we do not send duplicate indicators if not requested by app */

  /* If it was requested by app, transmit CIEV even if it is duplicate. */

  if (id == BTA_AG_IND_CALL) {

    if ((value == p_scb->call_ind) && (on_demand == false)) return;

    if ((value == p_scb->call_ind) && (!on_demand)) return;



    p_scb->call_ind = (uint8_t)value;

  }



  if ((id == BTA_AG_IND_CALLSETUP) && (on_demand == false)) {

  if ((id == BTA_AG_IND_CALLSETUP) && (!on_demand)) {

    if (value == p_scb->callsetup_ind) return;



    p_scb->callsetup_ind = (uint8_t)value;

  }



  if ((id == BTA_AG_IND_SERVICE) && (on_demand == false)) {

  if ((id == BTA_AG_IND_SERVICE) && (!on_demand)) {

    if (value == p_scb->service_ind) return;



    p_scb->service_ind = (uint8_t)value;

  }

  if ((id == BTA_AG_IND_SIGNAL) && (on_demand == false)) {

  if ((id == BTA_AG_IND_SIGNAL) && (!on_demand)) {

    if (value == p_scb->signal_ind) return;



    p_scb->signal_ind = (uint8_t)value;

  }

  if ((id == BTA_AG_IND_ROAM) && (on_demand == false)) {

  if ((id == BTA_AG_IND_ROAM) && (!on_demand)) {

    if (value == p_scb->roam_ind) return;



    p_scb->roam_ind = (uint8_t)value;

  }

  if ((id == BTA_AG_IND_BATTCHG) && (on_demand == false)) {

  if ((id == BTA_AG_IND_BATTCHG) && (!on_demand)) {

    if (value == p_scb->battchg_ind) return;



    p_scb->battchg_ind = (uint8_t)value;

  }



  if ((id == BTA_AG_IND_CALLHELD) && (on_demand == false)) {

  if ((id == BTA_AG_IND_CALLHELD) && (!on_demand)) {

    /* call swap could result in sending callheld=1 multiple times */

    if ((value != 1) && (value == p_scb->callheld_ind)) return;
@@ -750,8 +750,7 @@ static void bta_ag_bind_response(tBTA_AG_SCB* p_scb, uint8_t arg_type) { 
          p_scb->local_hf_indicators[i].ind_id);



      /* Check whether local and peer sides support this indicator */

      if (p_scb->local_hf_indicators[i].is_supported == true &&

          peer_index != -1) {

      if (p_scb->local_hf_indicators[i].is_supported && peer_index != -1) {

        /* In the format of ind, state */

        p += utl_itoa((uint16_t)p_scb->local_hf_indicators[i].ind_id, p);

        *p++ = ',';
@@ -1670,7 +1669,7 @@ void bta_ag_hfp_result(tBTA_AG_SCB* p_scb, tBTA_AG_API_RESULT* p_result) { 
        } else {

          APPL_TRACE_DEBUG(

              "%s HF Indicator %d already %s", p_result->data.ind.id,

              (p_result->data.ind.on_demand == true) ? "Enabled" : "Disabled");

              (p_result->data.ind.on_demand) ? "Enabled" : "Disabled");

        }

      }

      break;

system/bta/ag/bta_ag_sco.cc

+1 −1
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ void bta_ag_sco_close(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
 *

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

void bta_ag_sco_codec_nego(tBTA_AG_SCB* p_scb, bool result) {

  if (result == true) {

  if (result) {

    /* Subsequent SCO connection will skip codec negotiation */

    APPL_TRACE_DEBUG("%s: Succeeded for index 0x%04x", __func__,

                     p_scb->sco_idx);

system/bta/ag/bta_ag_sdp.cc

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ void bta_ag_del_records(tBTA_AG_SCB* p_scb, UNUSED_ATTR tBTA_AG_DATA* p_data) { 
      continue;

    }



    if (p->in_use && p->dealloc == false) {

    if (p->in_use && !p->dealloc) {

      others |= p->reg_services;

    }

  }

system/bta/av/bta_av_aact.cc

+10 −11
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void bta_av_st_rc_timer(tBTA_AV_SCB* p_scb, 
  /* for outgoing RC connection as INT/CT */

  if ((p_scb->rc_handle == BTA_AV_RC_HANDLE_NONE) &&

      /* (bta_av_cb.features & BTA_AV_FEAT_RCCT) && */

      (p_scb->use_rc == true || (p_scb->role & BTA_AV_ROLE_AD_ACP))) {

      (p_scb->use_rc || (p_scb->role & BTA_AV_ROLE_AD_ACP))) {

    if ((p_scb->wait & BTA_AV_WAIT_ROLE_SW_BITS) == 0) {

      bta_sys_start_timer(p_scb->avrc_ct_timer, BTA_AV_RC_DISC_TIME_VAL,

                          BTA_AV_AVRC_TIMER_EVT, p_scb->hndl);
@@ -382,7 +382,7 @@ static bool bta_av_next_getcap(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  for (i = p_scb->sep_info_idx; i < p_scb->num_seps; i++) {

    /* steam not in use, is a sink, and is the right media type (audio/video) */

    if ((p_scb->sep_info[i].in_use == false) &&

    if ((!p_scb->sep_info[i].in_use) &&

        (p_scb->sep_info[i].tsep == sep_requested) &&

        (p_scb->sep_info[i].media_type == p_scb->media_type)) {

      p_scb->sep_info_idx = i;
@@ -975,7 +975,7 @@ void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  bta_sys_app_open(BTA_ID_AV, p_scb->app_id, p_scb->peer_addr);



  if (p_scb->skip_sdp == true) {

  if (p_scb->skip_sdp) {

    tA2DP_Service a2dp_ser;

    a2dp_ser.avdt_version = AVDT_VERSION;

    p_scb->skip_sdp = false;
@@ -1569,7 +1569,7 @@ void bta_av_disc_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  for (i = 0; i < p_scb->num_seps; i++) {

    /* steam not in use, is a sink, and is audio */

    if ((p_scb->sep_info[i].in_use == false) &&

    if ((!p_scb->sep_info[i].in_use) &&

        (p_scb->sep_info[i].media_type == p_scb->media_type)) {

      if ((p_scb->sep_info[i].tsep == AVDT_TSEP_SNK) &&

          (uuid_int == UUID_SERVCLASS_AUDIO_SOURCE))
@@ -1748,7 +1748,7 @@ void bta_av_open_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  /* check whether there is already an opened audio or video connection with the

   * same device */

  for (idx = 0; (idx < BTA_AV_NUM_STRS) && (is_av_opened == false); idx++) {

  for (idx = 0; (idx < BTA_AV_NUM_STRS) && (!is_av_opened); idx++) {

    p_opened_scb = bta_av_cb.p_scb[idx];

    if (p_opened_scb && (p_opened_scb->state == BTA_AV_OPEN_SST) &&

        (p_opened_scb->peer_addr == p_scb->peer_addr))
@@ -1758,7 +1758,7 @@ void bta_av_open_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  /* if there is already an active AV connnection with the same bd_addr,

     don't send disconnect req, just report the open event with

     BTA_AV_FAIL_GET_CAP status */

  if (is_av_opened == true) {

  if (is_av_opened) {

    tBTA_AV_OPEN open;

    open.bd_addr = p_scb->peer_addr;

    open.chnl = p_scb->chnl;
@@ -1960,8 +1960,7 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  bta_sys_clear_policy(BTA_ID_AV, policy, p_scb->peer_addr);



  if ((p_scb->started == false) &&

      ((p_scb->role & BTA_AV_ROLE_START_INT) == 0)) {

  if ((!p_scb->started) && ((p_scb->role & BTA_AV_ROLE_START_INT) == 0)) {

    p_scb->role |= BTA_AV_ROLE_START_INT;

    bta_sys_busy(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->peer_addr);
@@ -2474,7 +2473,7 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
 *

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

void bta_av_start_failed(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {

  if (p_scb->started == false && p_scb->co_started == false) {

  if (!p_scb->started && !p_scb->co_started) {

    bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->peer_addr);

    notify_start_failed(p_scb);

  }
@@ -2580,7 +2579,7 @@ void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  APPL_TRACE_DEBUG("%s: audio_open_cnt = %d, err_code = %d", __func__,

                   bta_av_cb.audio_open_cnt, err_code);



  if (p_scb->started == false) {

  if (!p_scb->started) {

    /* handle the condition where there is a collision of SUSPEND req from

     *either side

     ** Second SUSPEND req could be rejected. Do not treat this as a failure
@@ -3021,7 +3020,7 @@ void bta_av_open_rc(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
    return;

  }



  if (p_scb->use_rc == true || (p_scb->role & BTA_AV_ROLE_AD_ACP)) {

  if (p_scb->use_rc || (p_scb->role & BTA_AV_ROLE_AD_ACP)) {

    if (bta_av_cb.disc) {

      /* AVRC discover db is in use */

      if (p_scb->rc_handle == BTA_AV_RC_HANDLE_NONE) {