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

Commit 3d83b381 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2CAP: Remove unused ConnectRsp am: 347a8dc6 

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

Change-Id: I1c1428f21cc3233903e686f9cae3b922e08c8518
parents 1b4dc333 347a8dc6

system/main/shim/l2c_api.cc

+0 −6
Original line number Diff line number Diff line
@@ -103,12 +103,6 @@ uint16_t bluetooth::shim::L2CA_ConnectReq(uint16_t psm, 
  return shim_l2cap.CreateConnection(psm, raw_address);

}



bool bluetooth::shim::L2CA_ConnectRsp(const RawAddress& p_bd_addr, uint8_t id,

                                      uint16_t lcid, uint16_t result,

                                      uint16_t status) {

  return shim_l2cap.ConnectResponse(p_bd_addr, id, lcid, result, status);

}



bool bluetooth::shim::L2CA_DisconnectReq(uint16_t cid) {

  return shim_l2cap.DisconnectRequest(cid);

}

system/main/shim/l2c_api.h

+0 −14
Original line number Diff line number Diff line
@@ -104,20 +104,6 @@ void L2CA_FreeLePSM(uint16_t psm); 
 ******************************************************************************/

uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& p_bd_addr);



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

 *

 * Function         L2CA_ConnectRsp

 *

 * Description      Higher layers call this function to accept an incoming

 *                  L2CAP connection, for which they had gotten an connect

 *                  indication callback.

 *

 * Returns          true for success, false for failure

 *

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

bool L2CA_ConnectRsp(const RawAddress& p_bd_addr, uint8_t id, uint16_t lcid,

                     uint16_t result, uint16_t status);



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

 *

 * Function         L2CA_RegisterLECoc

system/main/shim/l2cap.cc

+0 −11
Original line number Diff line number Diff line
@@ -357,17 +357,6 @@ void bluetooth::shim::legacy::L2cap::SetDownstreamCallbacks(uint16_t cid) { 
      });

}



bool bluetooth::shim::legacy::L2cap::ConnectResponse(

    const RawAddress& raw_address, uint8_t signal_id, uint16_t cid,

    uint16_t result, uint16_t status) {

  CHECK(ConnectionExists(cid));

  LOG_DEBUG(

      "%s Silently dropping client connect response as channel is "

      "already connected",

      __func__);

  return true;

}



bool bluetooth::shim::legacy::L2cap::DisconnectRequest(uint16_t cid) {

  CHECK(ConnectionExists(cid));

  if (cid_closing_set_.find(cid) != cid_closing_set_.end()) {

system/main/shim/l2cap.h

+0 −4
Original line number Diff line number Diff line
@@ -82,10 +82,6 @@ class L2cap { 
  uint16_t ConvertClientToRealPsm(uint16_t psm);

  void RemoveClientPsm(uint16_t client_psm);



  // Legacy API entry points

  bool ConnectResponse(const RawAddress& raw_address, uint8_t signal_id,

                       uint16_t cid, uint16_t result, uint16_t status);



  bool DisconnectRequest(uint16_t cid);



  bool GetRemoteCid(uint16_t cid, uint16_t* remote_cid);

system/stack/include/l2c_api.h

+0 −14
Original line number Diff line number Diff line
@@ -364,20 +364,6 @@ extern uint16_t L2CA_ConnectReq2(uint16_t psm, const RawAddress& p_bd_addr, 
 ******************************************************************************/

extern uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& p_bd_addr);



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

 *

 * Function         L2CA_ConnectRsp

 *

 * Description      Higher layers call this function to accept an incoming

 *                  L2CAP connection, for which they had gotten an connect

 *                  indication callback.

 *

 * Returns          true for success, false for failure

 *

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

extern bool L2CA_ConnectRsp(const RawAddress& p_bd_addr, uint8_t id,

                            uint16_t lcid, uint16_t result, uint16_t status);



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

 *

 * Function         L2CA_RegisterLECoc