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

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

Merge "shim/l2cap: Fix RegisterLECoc function" am: 5e1cf5ce 

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

Change-Id: I173f7f20a996e9c2d4240cc88640578d763be1b2
parents 98e4170d 5e1cf5ce

system/main/shim/l2c_api.cc

+3 −2
Original line number Diff line number Diff line
@@ -112,8 +112,9 @@ bool bluetooth::shim::L2CA_DisconnectReq(uint16_t cid) { 
/**

 * Le Connection Oriented Channel APIs

 */

uint16_t bluetooth::shim::L2CA_RegisterLECoc(

    uint16_t psm, const tL2CAP_APPL_INFO& callbacks) {

uint16_t bluetooth::shim::L2CA_RegisterLECoc(uint16_t psm,

                                             const tL2CAP_APPL_INFO& callbacks,

                                             uint16_t sec_level) {

  LOG_INFO("UNIMPLEMENTED %s psm:%hd", __func__, psm);

  return 0;

}

system/main/shim/l2c_api.h

+2 −1
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& p_bd_addr); 
 *                  and BTM_SetSecurityLevel().

 *

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

uint16_t L2CA_RegisterLECoc(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info);

uint16_t L2CA_RegisterLECoc(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info,

                            uint16_t sec_level);



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

 *

system/stack/l2cap/l2c_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& p_bd_addr) { 
uint16_t L2CA_RegisterLECoc(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info,

                            uint16_t sec_level) {

  if (bluetooth::shim::is_gd_shim_enabled()) {

    return bluetooth::shim::L2CA_RegisterLECoc(psm, p_cb_info);

    return bluetooth::shim::L2CA_RegisterLECoc(psm, p_cb_info, sec_level);

  }



  BTM_SetSecurityLevel(false, "", 0, sec_level, psm, 0, 0);