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

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

Merge "l2cap: Notify upper layer about credit based conn request collision"... 

Merge "l2cap: Notify upper layer about credit based conn request collision" am: cb9432dd am: 8ef7dee7 am: 39eaf7e3 am: 6dec659e

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



Change-Id: I58b8b4a17b95da9b5d7ebc0dc84e7e41f535d736
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18392857 6dec659e

system/stack/avct/avct_l2c.cc

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ const tL2CAP_APPL_INFO avct_l2c_appl = { 
    NULL,

    NULL,

    NULL,

    NULL,

};



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

system/stack/avct/avct_l2c_br.cc

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ const tL2CAP_APPL_INFO avct_l2c_br_appl = {avct_l2c_br_connect_ind_cback, 
                                           avct_br_on_l2cap_error,

                                           NULL,

                                           NULL,

                                           NULL,

                                           NULL};



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

system/stack/avdt/avdt_l2c.cc

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ const tL2CAP_APPL_INFO avdt_l2c_appl = {avdt_l2c_connect_ind_cback, 
                                        avdt_on_l2cap_error,

                                        NULL,

                                        NULL,

                                        NULL,

                                        NULL};



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

system/stack/gatt/gatt_main.cc

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ static const tL2CAP_APPL_INFO dyn_info = {gatt_l2cif_connect_ind_cback, 
                                          gatt_on_l2cap_error,

                                          NULL,

                                          NULL,

                                          NULL,

                                          NULL};



tGATT_CB gatt_cb;

system/stack/hid/hidd_conn.cc

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static const tL2CAP_APPL_INFO dev_reg_info = {hidd_l2cif_connect_ind, 
                                              hidd_on_l2cap_error,

                                              NULL,

                                              NULL,

                                              NULL,

                                              NULL};



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