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

Commit 68805e00 authored by Chris Manton's avatar Chris Manton
Browse files

Align bt_transport_text syntactically with legacy 

Also disambiguate from identical call
service/logging_helpers.h

Bug: 163134718
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I75f25dcffb799879ab8f53e3cecba8bc573b5c16
parent 0cffd3bf

system/bta/gatt/bta_gattc_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -1088,12 +1088,12 @@ static void bta_gattc_conn_cback(tGATT_IF gattc_if, const RawAddress& bdaddr, 
                                 tBT_TRANSPORT transport) {

  if (connected) {

    LOG_INFO("Connected att_id:%hhu transport:%s reason:%s", gattc_if,

             BtTransportText(transport).c_str(),

             bt_transport_text(transport).c_str(),

             gatt_disconnection_reason_text(reason).c_str());

    btif_debug_conn_state(bdaddr, BTIF_DEBUG_CONNECTED, GATT_CONN_UNKNOWN);

  } else {

    LOG_INFO("Disconnected att_id:%hhu transport:%s reason:%s", gattc_if,

             BtTransportText(transport).c_str(),

             bt_transport_text(transport).c_str(),

             gatt_disconnection_reason_text(reason).c_str());

    btif_debug_conn_state(bdaddr, BTIF_DEBUG_DISCONNECTED, GATT_CONN_UNKNOWN);

  }

system/btif/src/btif_gatt_util.cc

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void btif_gatt_check_encrypted_link(RawAddress bd_addr, 
      !btif_gatt_is_link_encrypted(bd_addr)) {

    LOG_DEBUG("Checking gatt link peer:%s transport:%s",

              PRIVATE_ADDRESS(bd_addr),

              BtTransportText(transport_link).c_str());

              bt_transport_text(transport_link).c_str());

    BTA_DmSetEncryption(bd_addr, transport_link, &btif_gatt_set_encryption_cb,

                        BTM_BLE_SEC_ENCRYPT);

  }

system/main/shim/acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ void DumpsysAcl(int fd) { 
    LOG_DUMPSYS(fd, "    link_up_issued:%s",

                (acl_conn.link_up_issued) ? "true" : "false");

    LOG_DUMPSYS(fd, "    transport:%s",

                BtTransportText(acl_conn.transport).c_str());

                bt_transport_text(acl_conn.transport).c_str());

    LOG_DUMPSYS(fd, "    flush_timeout:0x%04x",

                acl_conn.flush_timeout_in_ticks);

    LOG_DUMPSYS(

system/stack/acl/btm_acl.cc

+4 −4
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, 
        "Unable to create duplicate acl when one already exists handle:%hu"

        " role:%s transport:%s",

        hci_handle, RoleText(link_role).c_str(),

        BtTransportText(transport).c_str());

        bt_transport_text(transport).c_str());

    return;

  }
@@ -390,7 +390,7 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, 
  LOG_DEBUG(

      "Created new ACL connection peer:%s role:%s handle:0x%04x transport:%s",

      PRIVATE_ADDRESS(bda), RoleText(p_acl->link_role).c_str(), hci_handle,

      BtTransportText(transport).c_str());

      bt_transport_text(transport).c_str());

  btm_set_link_policy(p_acl, btm_cb.acl_cb_.DefaultLinkPolicy());



  if (transport == BT_TRANSPORT_LE) {
@@ -2035,7 +2035,7 @@ tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, tBT_TRANSPORT transport) { 


  if (p_acl->Handle() == HCI_INVALID_HANDLE) {

    LOG_WARN("Cannot remove unknown acl bd_addr:%s transport:%s",

             PRIVATE_ADDRESS(bd_addr), BtTransportText(transport).c_str());

             PRIVATE_ADDRESS(bd_addr), bt_transport_text(transport).c_str());

    return BTM_UNKNOWN_ADDR;

  }
@@ -2043,7 +2043,7 @@ tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, tBT_TRANSPORT transport) { 
    LOG_DEBUG(

        "Delay disconnect until role switch is complete bd_addr:%s "

        "transport:%s",

        PRIVATE_ADDRESS(bd_addr), BtTransportText(transport).c_str());

        PRIVATE_ADDRESS(bd_addr), bt_transport_text(transport).c_str());

    p_acl->rs_disc_pending = BTM_SEC_DISC_PENDING;

    return BTM_SUCCESS;

  }

system/stack/btm/btm_sec.cc

+3 −3
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
  p_dev_rec->is_originator = true;



  BTM_LogHistory(kBtmLogTag, bd_addr, "Bonding initiated",

                 BtTransportText(transport));

                 bt_transport_text(transport));



  if (transport == BT_TRANSPORT_LE) {

    btm_ble_init_pseudo_addr(p_dev_rec, bd_addr);
@@ -3745,7 +3745,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason) { 


  if (p_dev_rec->sec_state == BTM_SEC_STATE_DISCONNECTING_BOTH) {

    LOG_DEBUG("Waiting for other transport to disconnect current:%s",

              BtTransportText(transport).c_str());

              bt_transport_text(transport).c_str());

    p_dev_rec->sec_state = (transport == BT_TRANSPORT_LE)

                               ? BTM_SEC_STATE_DISCONNECTING

                               : BTM_SEC_STATE_DISCONNECTING_BLE;
@@ -3763,7 +3763,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_REASON reason) { 
                  BTM_ERR_PROCESSING);

    LOG_DEBUG("Cleaned up pending security state device:%s transport:%s",

              PRIVATE_ADDRESS(p_dev_rec->bd_addr),

              BtTransportText(transport).c_str());

              bt_transport_text(transport).c_str());

  }

}