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

Commit 789dd7a8 authored by Pomai Ahlo's avatar Pomai Ahlo
Browse files

RFCOMM SM logs[3/7] Remove redundant logs 

Bug: 358176338
Test: m com.android.btservices
Flag: EXEMPT logging change only
Change-Id: Iaddb68414a39fbb9ba4e952b71ee07e663045a97
parent 1a9124b2

system/stack/rfcomm/rfc_mx_fsm.cc

+1 −8
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ void rfc_mx_sm_state_wait_conn_cnf(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p 
 *

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

void rfc_mx_sm_state_configure(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) {

  log::verbose("event {}", event);

  switch (event) {

    case RFC_MX_EVENT_START_REQ:

    case RFC_MX_EVENT_CONN_CNF:
@@ -309,7 +308,6 @@ void rfc_mx_sm_state_configure(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_dat 
 *

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

void rfc_mx_sm_sabme_wait_ua(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* /* p_data */) {

  log::verbose("event {}", event);

  switch (event) {

    case RFC_MX_EVENT_START_REQ:

    case RFC_MX_EVENT_CONN_CNF:
@@ -374,7 +372,6 @@ void rfc_mx_sm_sabme_wait_ua(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* /* p_da 
 *

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

void rfc_mx_sm_state_wait_sabme(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) {

  log::verbose("event {}", event);

  switch (event) {

    case RFC_MX_EVENT_DISC_IND:

      p_mcb->state = RFC_MX_STATE_IDLE;
@@ -426,7 +423,7 @@ void rfc_mx_sm_state_wait_sabme(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_da 
      return;



    default:

      log::warn("RFCOMM MX ignored - evt:{} in state:{}", event,

      log::warn("Received unexpected event:{} in state:{}", event,

                rfcomm_mx_state_text(p_mcb->state));

  }

  log::verbose("RFCOMM MX ignored - evt:{} in state:{}", event, rfcomm_mx_state_text(p_mcb->state));
@@ -443,8 +440,6 @@ void rfc_mx_sm_state_wait_sabme(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_da 
 *

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

void rfc_mx_sm_state_connected(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* /* p_data */) {

  log::verbose("event {}", event);



  switch (event) {

    case RFC_MX_EVENT_TIMEOUT:

    case RFC_MX_EVENT_CLOSE_REQ:
@@ -490,8 +485,6 @@ void rfc_mx_sm_state_connected(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* /* p_ 
 ******************************************************************************/

void rfc_mx_sm_state_disc_wait_ua(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) {

  BT_HDR* p_buf;



  log::verbose("event {}", event);

  switch (event) {

    case RFC_MX_EVENT_UA:

    case RFC_MX_EVENT_DM:

system/stack/rfcomm/rfc_port_fsm.cc

+12 −12
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void rfc_port_sm_state_closed(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data 
                 rfcomm_port_state_text(p_port->rfc.state));

  }



  log::warn("Port state closed Event ignored {}", event);

  log::warn("Event ignored {}", event);

  return;

}
@@ -192,8 +192,7 @@ void rfc_port_sm_sabme_wait_ua(tPORT* p_port, tRFC_PORT_EVENT event, void* p_dat 
  switch (event) {

    case RFC_PORT_EVENT_OPEN:

    case RFC_PORT_EVENT_ESTABLISH_RSP:

      log::error("Port error state {} event {}",

                 rfcomm_port_state_text(static_cast<tRFC_PORT_STATE>(p_port->rfc.state)), event);

      log::error("Port error event:{}", event);

      return;



    case RFC_PORT_EVENT_CLOSE:
@@ -276,7 +275,7 @@ void rfc_port_sm_sabme_wait_ua(tPORT* p_port, tRFC_PORT_EVENT event, void* p_dat 
      log::error("Received unexpected event:{} in state:{}", event,

                 rfcomm_port_state_text(static_cast<tRFC_PORT_STATE>(p_port->rfc.state)));

  }

  log::warn("Port state sabme_wait_ua Event ignored {}", event);

  log::warn("Event ignored {}", event);

}



/*******************************************************************************
@@ -315,7 +314,7 @@ void rfc_port_sm_term_wait_sec_check(tPORT* p_port, tRFC_PORT_EVENT event, void* 


    case RFC_PORT_EVENT_OPEN:

    case RFC_PORT_EVENT_CLOSE:

      log::error("Port error state {} event {}", p_port->rfc.state, event);

      log::error("Port error event {}", event);

      return;



    case RFC_PORT_EVENT_CLEAR:
@@ -381,7 +380,7 @@ void rfc_port_sm_term_wait_sec_check(tPORT* p_port, tRFC_PORT_EVENT event, void* 
      log::error("Received unexpected event:{} in state:{}", event,

                 rfcomm_port_state_text(p_port->rfc.state));

  }

  log::warn("Port state term_wait_sec_check Event ignored {}", event);

  log::warn("Event ignored {}", event);

}



/*******************************************************************************
@@ -437,7 +436,7 @@ void rfc_port_sm_orig_wait_sec_check(tPORT* p_port, tRFC_PORT_EVENT event, void* 
      log::error("Received unexpected event:{} in state:{}", event,

                 rfcomm_port_state_text(p_port->rfc.state));

  }

  log::warn("Port state orig_wait_sec_check Event ignored {}", event);

  log::warn("Event ignored {}", event);

}



/*******************************************************************************
@@ -537,11 +536,12 @@ void rfc_port_sm_opened(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data) { 
      return;



    default:

      break;

  }

      log::error("Received unexpected event:{} bd_addr:{} handle:{} dlci:{} scn:{}",

                 rfcomm_port_event_text(event), p_port->bd_addr, p_port->handle, p_port->dlci,

                 p_port->scn);

      break;

  }

  log::warn("Event ignored {}", event);

}



/*******************************************************************************
@@ -558,7 +558,7 @@ void rfc_port_sm_disc_wait_ua(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data 
  switch (event) {

    case RFC_PORT_EVENT_OPEN:

    case RFC_PORT_EVENT_ESTABLISH_RSP:

      log::error("Port error state {} event {}", p_port->rfc.state, event);

      log::error("Port error event {}", event);

      return;



    case RFC_PORT_EVENT_CLEAR:
@@ -612,7 +612,7 @@ void rfc_port_sm_disc_wait_ua(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data 
                 rfcomm_port_state_text(p_port->rfc.state));

  }



  log::warn("Port state disc_wait_ua Event ignored {}", event);

  log::warn("Event ignored {}", event);

}



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