aboutsummaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-12-09 19:50:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-12-09 19:50:08 +0000
commita6052da10f4d899ee7112915ebf82f3c00a32f1a (patch)
treea99fb4ba457aa7bd4f9965b82fd4ff6907f046e7 /main
parent098ea043d863c3b009fe10e74bb2008ddb65b2cc (diff)
parentf436bc72cc1ae9bb472750b6d27f4b95b0edb820 (diff)
downloadbt-a6052da10f4d899ee7112915ebf82f3c00a32f1a.tar.gz
Merge changes I1abcf94d,I720b8a16
* changes: Simplify security level parameter for SDP L2CAP: Remove never used API Ping and Echo
Diffstat (limited to 'main')
-rw-r--r--main/shim/l2c_api.cc17
-rw-r--r--main/shim/l2c_api.h24
2 files changed, 0 insertions, 41 deletions
diff --git a/main/shim/l2c_api.cc b/main/shim/l2c_api.cc
index ccfb8795b..f9676db58 100644
--- a/main/shim/l2c_api.cc
+++ b/main/shim/l2c_api.cc
@@ -240,23 +240,6 @@ uint8_t bluetooth::shim::L2CA_SetDesireRole(uint8_t new_role) {
}
/**
- * Ping APIs
- */
-bool bluetooth::shim::L2CA_Ping(const RawAddress& p_bd_addr,
- tL2CA_ECHO_RSP_CB* p_callback) {
- LOG_INFO(LOG_TAG, "UNIMPLEMENTED %s addr:%s p_callback:%p", __func__,
- p_bd_addr.ToString().c_str(), p_callback);
- return false;
-}
-
-bool bluetooth::shim::L2CA_Echo(const RawAddress& p_bd_addr, BT_HDR* p_data,
- tL2CA_ECHO_DATA_CB* p_callback) {
- LOG_INFO(LOG_TAG, "UNIMPLEMENTED %s addr:%s p_callback:%p", __func__,
- p_bd_addr.ToString().c_str(), p_callback);
- return false;
-}
-
-/**
* Link APIs
*/
bool bluetooth::shim::L2CA_SetIdleTimeoutByBdAddr(const RawAddress& bd_addr,
diff --git a/main/shim/l2c_api.h b/main/shim/l2c_api.h
index 83f3afa26..011a77bb6 100644
--- a/main/shim/l2c_api.h
+++ b/main/shim/l2c_api.h
@@ -287,30 +287,6 @@ bool L2CA_DisconnectRsp(uint16_t cid);
******************************************************************************/
uint8_t L2CA_DataWrite(uint16_t cid, BT_HDR* p_data);
-/*******************************************************************************
- *
- * Function L2CA_Ping
- *
- * Description Higher layers call this function to send an echo request.
- *
- * Returns true if echo request sent, else false.
- *
- ******************************************************************************/
-bool L2CA_Ping(const RawAddress& p_bd_addr, tL2CA_ECHO_RSP_CB* p_cb);
-
-/*******************************************************************************
- *
- * Function L2CA_Echo
- *
- * Description Higher layers call this function to send an echo request
- * with application-specific data.
- *
- * Returns true if echo request sent, else false.
- *
- ******************************************************************************/
-bool L2CA_Echo(const RawAddress& p_bd_addr, BT_HDR* p_data,
- tL2CA_ECHO_DATA_CB* p_callback);
-
// Given a local channel identifier, |lcid|, this function returns the bound
// remote channel identifier, |rcid|, and the ACL link handle, |handle|. If
// |lcid| is not known or is invalid, this function returns false and does not