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

Commit f61b8aba authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "cpplint: fix and enable whitespace/newline" into main

parents 442e029b 46075067

CPPLINT.cfg

+0 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ linelength=100 
# CPPLint enforces +1, but our rule is no indentation.

filter=-whitespace/indent



# TODO: b/364967694 re-enable the warning

filter=-whitespace/newline

# TODO: b/364967694 re-enable the warning

filter=-whitespace/blank_line

# TODO: b/364967694 re-enable the warning

system/bta/ag/bta_ag_at.cc

+4 −6
Original line number Diff line number Diff line
@@ -110,14 +110,12 @@ static void bta_ag_process_at(tBTA_AG_AT_CB* p_cb, char* p_end) { 
    /* if no argument */

    if (p_arg[0] == 0) {

      arg_type = BTA_AG_AT_NONE;

    }

    } else if (p_arg[0] == '?' && p_arg[1] == 0) {

      /* else if arg is '?' and it is last character */

    else if (p_arg[0] == '?' && p_arg[1] == 0) {

      /* we have a read */

      arg_type = BTA_AG_AT_READ;

    }

    } else if (p_arg[0] == '=' && p_arg[1] != 0) {

      /* else if arg is '=' */

    else if (p_arg[0] == '=' && p_arg[1] != 0) {

      if (p_arg[1] == '?' && p_arg[2] == 0) {

        /* we have a test */

        arg_type = BTA_AG_AT_TEST;

system/bta/ag/bta_ag_cmd.cc

+3 −4
Original line number Diff line number Diff line
@@ -942,10 +942,9 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type, cha 
          event = BTA_AG_ENABLE_EVT;

          bta_ag_send_error(p_scb, BTA_AG_ERR_OP_NOT_SUPPORTED);

        }

      }

      } else {

        /* If dial cmd, make sure string contains only dial digits

        ** Dial digits are 0-9, A-C, *, #, + */

      else {

        /* Some car kits may add some unwanted space characters in the

        ** input string. This workaround will trim the unwanted chars. */

        remove_spaces(val.str);

system/bta/ag/bta_ag_sco.cc

+2 −3
Original line number Diff line number Diff line
@@ -174,9 +174,8 @@ static void bta_ag_sco_conn_cback(uint16_t sco_idx) { 
  /* match callback to scb; first check current sco scb */

  if (bta_ag_cb.sco.p_curr_scb != nullptr && bta_ag_cb.sco.p_curr_scb->in_use) {

    handle = bta_ag_scb_to_idx(bta_ag_cb.sco.p_curr_scb);

  }

  } else {

    /* then check for scb connected to this peer */

  else {

    /* Check if SLC is up */

    handle = bta_ag_idx_by_bdaddr(BTM_ReadScoBdAddr(sco_idx));

    p_scb = bta_ag_scb_by_idx(handle);

system/bta/ag/bta_ag_sdp.cc

+4 −6
Original line number Diff line number Diff line
@@ -466,17 +466,15 @@ void bta_ag_do_disc(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
    attr_list[3] = ATTR_ID_SUPPORTED_FEATURES;

    num_attr = 4;

    uuid_list[0] = Uuid::From16Bit(UUID_SERVCLASS_HF_HANDSFREE);

  }

  } else if (service & BTA_HFP_SERVICE_MASK && p_scb->role == BTA_AG_ACP) {

    /* HFP acceptor; get features */

  else if (service & BTA_HFP_SERVICE_MASK && p_scb->role == BTA_AG_ACP) {

    attr_list[0] = ATTR_ID_SERVICE_CLASS_ID_LIST;

    attr_list[1] = ATTR_ID_BT_PROFILE_DESC_LIST;

    attr_list[2] = ATTR_ID_SUPPORTED_FEATURES;

    num_attr = 3;

    uuid_list[0] = Uuid::From16Bit(UUID_SERVCLASS_HF_HANDSFREE);

  }

  } else if (service & BTA_HSP_SERVICE_MASK && p_scb->role == BTA_AG_INT) {

    /* HSP initiator; get proto list */

  else if (service & BTA_HSP_SERVICE_MASK && p_scb->role == BTA_AG_INT) {

    attr_list[0] = ATTR_ID_SERVICE_CLASS_ID_LIST;

    attr_list[1] = ATTR_ID_PROTOCOL_DESC_LIST;

    attr_list[2] = ATTR_ID_BT_PROFILE_DESC_LIST;