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

Commit 4aac3fb0 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2cap channel cb: Store who initiated dynamic channel am: b1c8cb6e am: 2d308ec5 am: 9fafdb6f 

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

Change-Id: Id140a3345f73d1fcc461db2222875c7a8dbe5328
parents a0ca6eeb 9fafdb6f

system/stack/avct/avct_l2c.cc

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ void avct_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result) { 
 * Returns          void

 *

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

void avct_l2c_config_cfm_cback(uint16_t lcid, uint16_t result) {

void avct_l2c_config_cfm_cback(uint16_t lcid, uint16_t initiator) {

  tAVCT_LCB* p_lcb;



  /* look up lcb for this channel */

system/stack/avct/avct_l2c_br.cc

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void avct_l2c_br_connect_cfm_cback(uint16_t lcid, uint16_t result) { 
 * Returns          void

 *

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

void avct_l2c_br_config_cfm_cback(uint16_t lcid, uint16_t result) {

void avct_l2c_br_config_cfm_cback(uint16_t lcid, uint16_t initiator) {

  tAVCT_BCB* p_lcb;



  /* look up lcb for this channel */

system/stack/avdt/avdt_l2c.cc

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ void avdt_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result) { 
 * Returns          void

 *

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

void avdt_l2c_config_cfm_cback(uint16_t lcid, uint16_t result) {

void avdt_l2c_config_cfm_cback(uint16_t lcid, uint16_t initiator) {

  AvdtpTransportChannel* p_tbl;



  AVDT_TRACE_DEBUG("%s: lcid: %d", __func__, lcid);

system/stack/bnep/bnep_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static void bnep_config_ind(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) { 
 * Returns          void

 *

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

static void bnep_config_cfm(uint16_t l2cap_cid, uint16_t result) {

static void bnep_config_cfm(uint16_t l2cap_cid, uint16_t initiator) {

  tBNEP_CONN* p_bcb;



  BNEP_TRACE_EVENT("BNEP - Rcvd cfg cfm, CID: 0x%x", l2cap_cid);

system/stack/gap/gap_conn.cc

+1 −1
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ static void gap_config_ind(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) { 
 * Returns          void

 *

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

static void gap_config_cfm(uint16_t l2cap_cid, uint16_t result) {

static void gap_config_cfm(uint16_t l2cap_cid, uint16_t initiator) {

  tGAP_CCB* p_ccb;



  /* Find CCB based on CID */