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

Commit e7e763af authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "Remove use of multiline \ in format strings" into main am: 6931db62 

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



Change-Id: I8c3f8b9d19807bb56d3e94515ee6df7f630dc5a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 51695544 6931db62

system/gd/hal/snoop_logger.cc

+5 −5
Original line number Diff line number Diff line
@@ -214,11 +214,11 @@ void ProfilesFilter::PrintProfilesConfig() { 
  for (int i = 0; i < FILTER_PROFILE_MAX; i++) {

    if (profiles[i].enabled) {

      LOG_DEBUG(

          "\ntype: %s \

                \nenabled: %d, l2cap_opened: %d, rfcomm_opened: %d\

                \nflow_ext_l2cap: %d, flow_ext_rfcomm: %d\

                \nlcid: %d, rcid: %d, rfcomm_uuid: %d, psm: %d\

                \nscn: %d \n",

          "\ntype: %s"

          "\nenabled: %d, l2cap_opened: %d, rfcomm_opened: %d"

          "\nflow_ext_l2cap: %d, flow_ext_rfcomm: %d"

          "\nlcid: %d, rcid: %d, rfcomm_uuid: %d, psm: %d"

          "\nscn: %d\n",

          ProfilesFilter::ProfileToString(profiles[i].type).c_str(),

          profiles[i].enabled,

          profiles[i].l2cap_opened,

system/stack/avrc/avrc_api.cc

+2 −2
Original line number Diff line number Diff line
@@ -530,8 +530,8 @@ static uint8_t avrc_proc_far_msg(uint8_t handle, uint8_t label, uint8_t cr, 
      /* Received a CONTINUE/END, but no corresponding START

                      (or previous fragmented response was dropped) */

      LOG_VERBOSE(

          "Received a CONTINUE/END without no corresponding START \

                                (or previous fragmented response was dropped)");

          "Received a CONTINUE/END without no corresponding START"

          " (or previous fragmented response was dropped)");

      drop_code = 5;

      osi_free(p_pkt);

      *pp_pkt = NULL;

system/stack/btm/btm_ble_sec.cc

+1 −2
Original line number Diff line number Diff line
@@ -411,8 +411,7 @@ void BTM_BleSetPrefConnParams(const RawAddress& bd_addr, uint16_t min_conn_int, 
  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);



  LOG_VERBOSE(

      "BTM_BleSetPrefConnParams min: %u  max: %u  latency: %u  \

                    tout: %u",

      "BTM_BleSetPrefConnParams min: %u  max: %u  latency: %u tout: %u",

      min_conn_int, max_conn_int, peripheral_latency, supervision_tout);



  if (BTM_BLE_ISVALID_PARAM(min_conn_int, BTM_BLE_CONN_INT_MIN,

system/stack/l2cap/l2c_utils.cc

+2 −2
Original line number Diff line number Diff line
@@ -2950,8 +2950,8 @@ void l2cu_send_peer_ble_credit_based_conn_req(tL2C_CCB* p_ccb) { 
  initial_credit = p_ccb->local_conn_cfg.credits;



  LOG_VERBOSE(

      "l2cu_send_peer_ble_credit_based_conn_req PSM:0x%04x local_cid:%d\

                mtu:%d mps:%d initial_credit:%d",

      "l2cu_send_peer_ble_credit_based_conn_req PSM:0x%04x local_cid:%d"

      " mtu:%d mps:%d initial_credit:%d",

      p_ccb->p_rcb->real_psm, p_ccb->local_cid, mtu, mps, initial_credit);



  UINT16_TO_STREAM(p, p_ccb->p_rcb->real_psm);