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

Commit 741a2c11 authored by Aritra Sen's avatar Aritra Sen
Browse files

Remove duplicate logging in dumpsys and logcat. 

We currently seem to log the same information in logcat and dumpsys using a generic function.
This doesn't help in debugging particularly and relying on dumpsys information sounds like a good enough decision here.
Added relevant context specific logging instead.

Bug: 295023364
Test: m .
Flag: EXEMPT logging changes
Change-Id: Idb84a703507b2a53c891613ffbd094e7c7831e12
parent 87b85eba

system/btif/src/btif_sock.cc

+18 −4
Original line number Diff line number Diff line
@@ -162,9 +162,6 @@ void btif_sock_cleanup(void) { 


void btif_sock_connection_logger(int state, int role, const RawAddress& addr,

                                 int channel, const char* server_name) {

  log::info("address={}, state={}, role={}, server_name={}, channel={}",

            ADDRESS_TO_LOGGABLE_CSTR(addr), state, role, server_name, channel);



  uint8_t index = logger_index++ % SOCK_LOGGER_SIZE_MAX;



  connection_logger[index] = {
@@ -270,6 +267,11 @@ static bt_status_t btsock_listen(btsock_type_t type, const char* service_name, 
  *sock_fd = INVALID_FD;

  bt_status_t status = BT_STATUS_FAIL;



  log::info(

      "Attempting listen for socket connections for device: {}, type: {}, "

      "channel: {}, "

      "app_uid: {}",

      ADDRESS_TO_LOGGABLE_CSTR(RawAddress::kEmpty), type, channel, app_uid);

  log_socket_connection_state(RawAddress::kEmpty, 0, type,

                              android::bluetooth::SocketConnectionstateEnum::

                                  SOCKET_CONNECTION_STATE_LISTENING,
@@ -298,6 +300,11 @@ static bt_status_t btsock_listen(btsock_type_t type, const char* service_name, 
      break;

  }

  if (status != BT_STATUS_SUCCESS) {

    log::error(

        "failed to listen for socket connections for device: {}, type: {}, "

        "channel: {}, "

        "app_uid: {}",

        ADDRESS_TO_LOGGABLE_CSTR(RawAddress::kEmpty), type, channel, app_uid);

    btif_sock_connection_logger(SOCKET_CONNECTION_STATE_DISCONNECTED,

                                SOCKET_ROLE_LISTEN, RawAddress::kEmpty, channel,

                                service_name);
@@ -316,7 +323,10 @@ static bt_status_t btsock_connect(const RawAddress* bd_addr, btsock_type_t type, 
  CHECK(bd_addr != NULL);

  CHECK(sock_fd != NULL);



  log::info("");

  log::info(

      "Attempting socket connection for device: {}, type: {}, channel: {}, "

      "app_uid: {}",

      ADDRESS_TO_LOGGABLE_CSTR(*bd_addr), type, channel, app_uid);



  *sock_fd = INVALID_FD;

  bt_status_t status = BT_STATUS_FAIL;
@@ -368,6 +378,10 @@ static bt_status_t btsock_connect(const RawAddress* bd_addr, btsock_type_t type, 
      break;

  }

  if (status != BT_STATUS_SUCCESS) {

    log::error(

        "Socket connection failed for device: {}, type: {}, channel: {}, "

        "app_uid: {}",

        ADDRESS_TO_LOGGABLE_CSTR(*bd_addr), type, channel, app_uid);

    btif_sock_connection_logger(SOCKET_CONNECTION_STATE_DISCONNECTED,

                                SOCKET_ROLE_CONNECTION, *bd_addr, channel,

                                uuid->ToString().c_str());

system/btif/src/btif_sock_l2cap.cc

+25 −0
Original line number Diff line number Diff line
@@ -208,6 +208,11 @@ static void btsock_l2cap_free_l(l2cap_socket* sock) { 
  if (!t) /* prever double-frees */

    return;



  log::info(

      "Disconnected L2CAP connection for device: {}, channel: {}, app_uid: {}, "

      "id: {}, is_le: {}",

      ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid,

      sock->id, sock->is_le_coc);

  btif_sock_connection_logger(

      SOCKET_CONNECTION_STATE_DISCONNECTED,

      sock->server ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, sock->addr,
@@ -414,6 +419,11 @@ static void on_srv_l2cap_listen_started(tBTA_JV_L2CAP_START* p_start, 


  sock->handle = p_start->handle;



  log::info(

      "Listening for L2CAP connection for device: {}, channel: {}, app_uid: "

      "{}, id: {}, is_le: {}",

      ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid,

      sock->id, sock->is_le_coc);

  btif_sock_connection_logger(

      SOCKET_CONNECTION_STATE_LISTENING,

      sock->server ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, sock->addr,
@@ -482,6 +492,11 @@ static void on_srv_l2cap_psm_connect_l(tBTA_JV_L2CAP_OPEN* p_open, 
  accept_rs->id = sock->id;

  sock->id = new_listen_id;



  log::info(

      "Connected to L2CAP connection for device: {}, channel: {}, app_uid: {}, "

      "id: {}, is_le: {}",

      ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid,

      sock->id, sock->is_le_coc);

  btif_sock_connection_logger(

      SOCKET_CONNECTION_STATE_CONNECTED,

      accept_rs->server ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION,
@@ -527,6 +542,11 @@ static void on_cl_l2cap_psm_connect_l(tBTA_JV_L2CAP_OPEN* p_open, 
    return;

  }



  log::info(

      "Connected to L2CAP connection for device: {}, channel: {}, app_uid: {}, "

      "id: {}, is_le: {}",

      ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid,

      sock->id, sock->is_le_coc);

  btif_sock_connection_logger(

      SOCKET_CONNECTION_STATE_CONNECTED,

      sock->server ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, sock->addr,
@@ -584,6 +604,11 @@ static void on_l2cap_close(tBTA_JV_L2CAP_CLOSE* p_close, uint32_t id) { 
    return;

  }



  log::info(

      "Disconnecting from L2CAP connection for device: {}, channel: {}, "

      "app_uid: {}, id: {}, is_le: {}",

      ADDRESS_TO_LOGGABLE_CSTR(sock->addr), sock->channel, sock->app_uid,

      sock->id, sock->is_le_coc);

  btif_sock_connection_logger(

      SOCKET_CONNECTION_STATE_DISCONNECTING,

      sock->server ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, sock->addr,

system/btif/src/btif_sock_rfc.cc

+18 −0
Original line number Diff line number Diff line
@@ -434,6 +434,11 @@ static void cleanup_rfc_slot(rfc_slot_t* slot) { 
  if (slot->fd != INVALID_FD) {

    shutdown(slot->fd, SHUT_RDWR);

    close(slot->fd);

    log::info(

        "disconnected from RFCOMM socket connections for device: {}, scn: {}, "

        "app_uid: {}, id: {}",

        ADDRESS_TO_LOGGABLE_CSTR(slot->addr), slot->scn, slot->app_uid,

        slot->id);

    btif_sock_connection_logger(

        SOCKET_CONNECTION_STATE_DISCONNECTED,

        slot->role ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, slot->addr,
@@ -533,6 +538,10 @@ static void on_srv_rfc_listen_started(tBTA_JV_RFCOMM_START* p_start, 
  }



  slot->rfc_handle = p_start->handle;

  log::info(

      "listening for RFCOMM socket connections for device: {}, scn: {}, "

      "app_uid: {}, id: {}",

      ADDRESS_TO_LOGGABLE_CSTR(slot->addr), slot->scn, slot->app_uid, id);

  btif_sock_connection_logger(

      SOCKET_CONNECTION_STATE_LISTENING,

      slot->role ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, slot->addr,
@@ -561,6 +570,11 @@ static uint32_t on_srv_rfc_connect(tBTA_JV_RFCOMM_SRV_OPEN* p_open, 
      srv_rs, &p_open->rem_bda, p_open->handle, p_open->new_listen_handle);

  if (!accept_rs) return 0;



  log::info(

      "connected to RFCOMM socket connections for device: {}, scn: {}, "

      "app_uid: {}, id: {}",

      ADDRESS_TO_LOGGABLE_CSTR(accept_rs->addr), accept_rs->scn,

      accept_rs->app_uid, id);

  btif_sock_connection_logger(

      SOCKET_CONNECTION_STATE_CONNECTED,

      accept_rs->role ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION,
@@ -603,6 +617,10 @@ static void on_cli_rfc_connect(tBTA_JV_RFCOMM_OPEN* p_open, uint32_t id) { 
  slot->rfc_port_handle = BTA_JvRfcommGetPortHdl(p_open->handle);

  slot->addr = p_open->rem_bda;



  log::info(

      "connected to RFCOMM socket connections for device: {}, scn: {}, "

      "app_uid: {}, id: {}",

      ADDRESS_TO_LOGGABLE_CSTR(slot->addr), slot->scn, slot->app_uid, id);

  btif_sock_connection_logger(

      SOCKET_CONNECTION_STATE_CONNECTED,

      slot->role ? SOCKET_ROLE_LISTEN : SOCKET_ROLE_CONNECTION, slot->addr,