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

Commit 79043ece authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Catch all rfc events in switches am: e3547c44 am: fdad2878 am:... 

legacy: Catch all rfc events in switches am: e3547c44 am: fdad2878 am: b9ad4a3f am: 260ebcf8

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1814926

Change-Id: I9444e6fee76e74e51f096eb18d9d19d70b5ca659
parents 5878545b 260ebcf8

system/stack/rfcomm/rfc_mx_fsm.cc

+22 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ void rfc_mx_sm_execute(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) { 
    case RFC_MX_STATE_DISC_WAIT_UA:

      rfc_mx_sm_state_disc_wait_ua(p_mcb, event, p_data);

      break;



    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_mcb->state);

  }

}
@@ -251,6 +255,9 @@ void rfc_mx_sm_state_wait_conn_cnf(tRFC_MCB* p_mcb, uint16_t event, 
        PORT_CloseInd(p_mcb);

      }

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_mcb->state);

  }

  RFCOMM_TRACE_EVENT("RFCOMM MX ignored - evt:%d in state:%d", event,

                     p_mcb->state);
@@ -296,6 +303,9 @@ void rfc_mx_sm_state_configure(tRFC_MCB* p_mcb, uint16_t event, void* p_data) { 


      PORT_StartCnf(p_mcb, RFCOMM_ERROR);

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_mcb->state);

  }

  RFCOMM_TRACE_EVENT("RFCOMM MX ignored - evt:%d in state:%d", event,

                     p_mcb->state);
@@ -357,6 +367,9 @@ void rfc_mx_sm_sabme_wait_ua(tRFC_MCB* p_mcb, uint16_t event, 


      PORT_StartCnf(p_mcb, RFCOMM_ERROR);

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_mcb->state);

  }

  RFCOMM_TRACE_EVENT("RFCOMM MX ignored - evt:%d in state:%d", event,

                     p_mcb->state);
@@ -419,6 +432,9 @@ void rfc_mx_sm_state_wait_sabme(tRFC_MCB* p_mcb, uint16_t event, void* p_data) { 


      PORT_CloseInd(p_mcb);

      return;



    default:

      LOG_WARN("RFCOMM MX ignored - evt:%d in state:%d", event, p_mcb->state);

  }

  RFCOMM_TRACE_EVENT("RFCOMM MX ignored - evt:%d in state:%d", event,

                     p_mcb->state);
@@ -461,6 +477,9 @@ void rfc_mx_sm_state_connected(tRFC_MCB* p_mcb, uint16_t event, 
      /* notify all ports that connection is gone */

      PORT_CloseInd(p_mcb);

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_mcb->state);

  }

  RFCOMM_TRACE_EVENT("RFCOMM MX ignored - evt:%d in state:%d", event,

                     p_mcb->state);
@@ -538,6 +557,9 @@ void rfc_mx_sm_state_disc_wait_ua(tRFC_MCB* p_mcb, uint16_t event, 


    case RFC_MX_EVENT_QOS_VIOLATION_IND:

      break;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_mcb->state);

  }

  RFCOMM_TRACE_EVENT("RFCOMM MX ignored - evt:%d in state:%d", event,

                     p_mcb->state);

system/stack/rfcomm/rfc_port_fsm.cc

+19 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "bt_target.h"

#include "hci/include/btsnoop.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/btm/btm_sec.h"

#include "stack/include/sdpdefs.h"
@@ -179,6 +180,9 @@ void rfc_port_sm_state_closed(tPORT* p_port, uint16_t event, void* p_data) { 
      RFCOMM_TRACE_ERROR("Port error state %d event %d", p_port->rfc.state,

                         event);

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_port->rfc.state);

  }



  RFCOMM_TRACE_WARNING("Port state closed Event ignored %d", event);
@@ -266,6 +270,9 @@ void rfc_port_sm_sabme_wait_ua(tPORT* p_port, uint16_t event, void* p_data) { 
      PORT_DlcEstablishCnf(p_port->rfc.p_mcb, p_port->dlci,

                           p_port->rfc.p_mcb->peer_l2cap_mtu, RFCOMM_ERROR);

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_port->rfc.state);

  }

  RFCOMM_TRACE_WARNING("Port state sabme_wait_ua Event ignored %d", event);

}
@@ -349,6 +356,9 @@ void rfc_port_sm_term_wait_sec_check(tPORT* p_port, uint16_t event, 
        }

      }

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_port->rfc.state);

  }

  RFCOMM_TRACE_WARNING("Port state term_wait_sec_check Event ignored %d",

                       event);
@@ -405,6 +415,9 @@ void rfc_port_sm_orig_wait_sec_check(tPORT* p_port, uint16_t event, 
    case RFC_PORT_EVENT_UIH:

      osi_free(p_data);

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_port->rfc.state);

  }

  RFCOMM_TRACE_WARNING("Port state orig_wait_sec_check Event ignored %d",

                       event);
@@ -494,6 +507,9 @@ void rfc_port_sm_opened(tPORT* p_port, uint16_t event, void* p_data) { 
      RFCOMM_TRACE_ERROR("Port error state %d event %d", p_port->rfc.state,

                         event);

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_port->rfc.state);

  }

  RFCOMM_TRACE_WARNING("Port state opened Event ignored %d", event);

}
@@ -554,6 +570,9 @@ void rfc_port_sm_disc_wait_ua(tPORT* p_port, uint16_t event, void* p_data) { 
                         p_port->handle);

      rfc_port_closed(p_port);

      return;

    default:

      LOG_ERROR("Received unexpected event:%hu in state:%hhu", event,

                p_port->rfc.state);

  }



  RFCOMM_TRACE_WARNING("Port state disc_wait_ua Event ignored %d", event);