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

Commit ea4c4b9d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Properly reset tL2C_CCB::ecoc" am: 1de12568 am: 79cfff53 

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

Change-Id: I6df15699b20b688583fca8c3960ecca7d7c7fda0
parents 0dc32290 79cfff53

system/stack/l2cap/l2c_int.h

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ typedef struct t_l2c_ccb { 
  uint16_t remote_credit_count;



  /* used to indicate that ECOC is used */

  bool ecoc;

  bool ecoc{false};

  bool reconfig_started;

} tL2C_CCB;

system/stack/l2cap/l2c_utils.cc

+1 −0
Original line number Diff line number Diff line
@@ -1452,6 +1452,7 @@ tL2C_CCB* l2cu_allocate_ccb(tL2C_LCB* p_lcb, uint16_t cid) { 
  p_ccb->rx_data_rate = L2CAP_CHNL_DATA_RATE_LOW;



  p_ccb->is_flushable = false;

  p_ccb->ecoc = false;



  alarm_free(p_ccb->l2c_ccb_timer);

  p_ccb->l2c_ccb_timer = alarm_new("l2c.l2c_ccb_timer");