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

Commit e0c9d16b authored by Bhakthavatsala Raghavendra's avatar Bhakthavatsala Raghavendra Committed by Automerger Merge Worker
Browse files

Merge "Avoid processing l2cap events when stack being shutdown" into main am: f5f35c26 

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



Change-Id: I9ad13d63d693ef295eca0745d84242085784d106
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c916d3bb f5f35c26

system/stack/l2cap/l2c_main.cc

+12 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <bluetooth/log.h>

#include <string.h>

#include <com_android_bluetooth_flags.h>



#include "hal/snoop_logger.h"

#include "internal_include/bt_target.h"
@@ -43,6 +44,7 @@ 
#include "stack/l2cap/l2c_int.h"



using namespace bluetooth;

bool is_l2c_cleanup_inprogress;



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

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */
@@ -222,6 +224,14 @@ void l2c_rcv_acl_data(BT_HDR* p_msg) { 
static void process_l2cap_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len) {

  tL2C_RCB* p_rcb;



  /* if l2c free was already called that indicates stack being shutdown, donot process

   * any command*/

  if (com::android::bluetooth::flags::avoid_l2c_processing_while_stack_shutdown() &&

      is_l2c_cleanup_inprogress) {

    log::warn("Do not process any events when stack is being shutdown");

    return;

  }



  /* if l2cap command received in CID 1 on top of an LE link, ignore this

   * command */

  if (p_lcb->transport == BT_TRANSPORT_LE) {
@@ -872,9 +882,10 @@ void l2c_init(void) { 


  l2cb.l2c_ble_fixed_chnls_mask =

          L2CAP_FIXED_CHNL_ATT_BIT | L2CAP_FIXED_CHNL_BLE_SIG_BIT | L2CAP_FIXED_CHNL_SMP_BIT;

  is_l2c_cleanup_inprogress = false;

}



void l2c_free(void) {}

void l2c_free(void) { is_l2c_cleanup_inprogress = true; }



void l2c_ccb_timer_timeout(void* data) {

  tL2C_CCB* p_ccb = (tL2C_CCB*)data;