pL2CA_DisconnectCfm_Cb is unused

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Iedfafad7ca0546340230abc18dd2396ef5863fba

diff --git a/main/shim/l2cap.cc b/main/shim/l2cap.cc
index 178fabe..dc5ab70 100644 (file)
--- a/main/shim/l2cap.cc
+++ b/main/shim/l2cap.cc
@@ -35,7 +35,6 @@ constexpr uint16_t kConnectionFail = 1;
 constexpr uint16_t kConnectionSuccess = 0;
 constexpr uint16_t kInvalidConnectionInterfaceDescriptor = 0;
 constexpr uint8_t kUnusedId = 0;
-constexpr uint16_t kUnusedResult = 0;
 }  // namespace
 
 bool bluetooth::shim::legacy::PsmManager::IsPsmRegistered(uint16_t psm) const {
@@ -336,12 +335,6 @@ void bluetooth::shim::legacy::L2cap::SetDownstreamCallbacks(uint16_t cid) {
         }
         if (cid_closing_set_.count(cid) == 1) {
           cid_closing_set_.erase(cid);
-          do_in_main_thread(
-              FROM_HERE,
-              base::Bind(
-                  classic_.Callbacks(CidToPsm(cid)).pL2CA_DisconnectCfm_Cb, cid,
-                  kUnusedResult));
-
         } else {
           do_in_main_thread(
               FROM_HERE,

diff --git a/stack/avct/avct_l2c.cc b/stack/avct/avct_l2c.cc
index e80c57c..06133a8 100644 (file)
--- a/stack/avct/avct_l2c.cc
+++ b/stack/avct/avct_l2c.cc
@@ -52,7 +52,6 @@ const tL2CAP_APPL_INFO avct_l2c_appl = {avct_l2c_connect_ind_cback,
                                         avct_l2c_config_ind_cback,
                                         avct_l2c_config_cfm_cback,
                                         avct_l2c_disconnect_ind_cback,
-                                        NULL,
                                         avct_l2c_data_ind_cback,
                                         avct_l2c_congestion_ind_cback,
                                         NULL,

diff --git a/stack/avct/avct_l2c_br.cc b/stack/avct/avct_l2c_br.cc
index 024e45a..e82d136 100644 (file)
--- a/stack/avct/avct_l2c_br.cc
+++ b/stack/avct/avct_l2c_br.cc
@@ -85,7 +85,6 @@ const tL2CAP_APPL_INFO avct_l2c_br_appl = {avct_l2c_br_connect_ind_cback,
                                            avct_l2c_br_config_ind_cback,
                                            avct_l2c_br_config_cfm_cback,
                                            avct_l2c_br_disconnect_ind_cback,
-                                           NULL,
                                            avct_l2c_br_data_ind_cback,
                                            avct_l2c_br_congestion_ind_cback,
                                            NULL,

diff --git a/stack/avdt/avdt_l2c.cc b/stack/avdt/avdt_l2c.cc
index 272b4c0..0003e55 100644 (file)
--- a/stack/avdt/avdt_l2c.cc
+++ b/stack/avdt/avdt_l2c.cc
@@ -52,7 +52,6 @@ const tL2CAP_APPL_INFO avdt_l2c_appl = {avdt_l2c_connect_ind_cback,
                                         avdt_l2c_config_ind_cback,
                                         avdt_l2c_config_cfm_cback,
                                         avdt_l2c_disconnect_ind_cback,
-                                        NULL,
                                         avdt_l2c_data_ind_cback,
                                         avdt_l2c_congestion_ind_cback,
                                         NULL,

diff --git a/stack/gatt/gatt_main.cc b/stack/gatt/gatt_main.cc
index 269008f..dc1e296 100644 (file)
--- a/stack/gatt/gatt_main.cc
+++ b/stack/gatt/gatt_main.cc
@@ -77,7 +77,6 @@ static const tL2CAP_APPL_INFO dyn_info = {gatt_l2cif_connect_ind_cback,
                                           gatt_l2cif_config_ind_cback,
                                           gatt_l2cif_config_cfm_cback,
                                           gatt_l2cif_disconnect_ind_cback,
-                                          NULL,
                                           gatt_l2cif_data_ind_cback,
                                           gatt_l2cif_congest_cback,
                                           NULL};

diff --git a/stack/hid/hidd_conn.cc b/stack/hid/hidd_conn.cc
index 1992bd7..361f984 100644 (file)
--- a/stack/hid/hidd_conn.cc
+++ b/stack/hid/hidd_conn.cc
@@ -57,9 +57,10 @@ static void hidd_l2cif_data_ind(uint16_t cid, BT_HDR* p_msg);
 static void hidd_l2cif_cong_ind(uint16_t cid, bool congested);
 
 static const tL2CAP_APPL_INFO dev_reg_info = {
-    hidd_l2cif_connect_ind, hidd_l2cif_connect_cfm,    hidd_l2cif_config_ind,
-    hidd_l2cif_config_cfm,  hidd_l2cif_disconnect_ind, NULL,
-    hidd_l2cif_data_ind,    hidd_l2cif_cong_ind,       NULL};
+    hidd_l2cif_connect_ind,    hidd_l2cif_connect_cfm,
+    hidd_l2cif_config_ind,     hidd_l2cif_config_cfm,
+    hidd_l2cif_disconnect_ind, hidd_l2cif_data_ind,
+    hidd_l2cif_cong_ind,       NULL};
 
 /*******************************************************************************
  *

diff --git a/stack/hid/hidh_conn.cc b/stack/hid/hidh_conn.cc
index e7955bf..7ca56b7 100644 (file)
--- a/stack/hid/hidh_conn.cc
+++ b/stack/hid/hidh_conn.cc
@@ -66,9 +66,10 @@ static void hidh_l2cif_disconnect(uint16_t l2cap_cid);
 static void hidh_l2cif_cong_ind(uint16_t l2cap_cid, bool congested);
 
 static const tL2CAP_APPL_INFO hst_reg_info = {
-    hidh_l2cif_connect_ind, hidh_l2cif_connect_cfm,    hidh_l2cif_config_ind,
-    hidh_l2cif_config_cfm,  hidh_l2cif_disconnect_ind, NULL,
-    hidh_l2cif_data_ind,    hidh_l2cif_cong_ind,       NULL,
+    hidh_l2cif_connect_ind,    hidh_l2cif_connect_cfm,
+    hidh_l2cif_config_ind,     hidh_l2cif_config_cfm,
+    hidh_l2cif_disconnect_ind, hidh_l2cif_data_ind,
+    hidh_l2cif_cong_ind,       NULL,
     /* tL2CA_TX_COMPLETE_CB */};
 
 /*******************************************************************************

diff --git a/stack/include/l2c_api.h b/stack/include/l2c_api.h
index 011130a..f22c8a2 100644 (file)
--- a/stack/include/l2c_api.h
+++ b/stack/include/l2c_api.h
@@ -249,7 +249,6 @@ typedef struct {
   tL2CA_CONFIG_IND_CB* pL2CA_ConfigInd_Cb;
   tL2CA_CONFIG_CFM_CB* pL2CA_ConfigCfm_Cb;
   tL2CA_DISCONNECT_IND_CB* pL2CA_DisconnectInd_Cb;
-  tL2CA_DISCONNECT_CFM_CB* pL2CA_DisconnectCfm_Cb;
   tL2CA_DATA_IND_CB* pL2CA_DataInd_Cb;
   tL2CA_CONGESTION_STATUS_CB* pL2CA_CongestionStatus_Cb;
   tL2CA_TX_COMPLETE_CB* pL2CA_TxComplete_Cb;

diff --git a/stack/l2cap/l2c_csm.cc b/stack/l2cap/l2c_csm.cc
index 8626b67..a21a046 100644 (file)
--- a/stack/l2cap/l2c_csm.cc
+++ b/stack/l2cap/l2c_csm.cc
@@ -577,14 +577,7 @@ static void l2c_csm_w4_l2cap_connect_rsp(tL2C_CCB* p_ccb, uint16_t event,
                            L2CAP_CHNL_DISCONNECT_TIMEOUT_MS,
                            l2c_ccb_timer_timeout, p_ccb);
       } else {
-        tL2CA_DISCONNECT_CFM_CB* disconnect_cfm =
-            p_ccb->p_rcb->api.pL2CA_DisconnectCfm_Cb;
         l2cu_release_ccb(p_ccb);
-        if (disconnect_cfm) {
-          L2CAP_TRACE_API("%s: L2CAP - Calling DisconnectCfm_Cb(), CID: 0x%04x",
-                          __func__, local_cid);
-          (*disconnect_cfm)(local_cid, L2CAP_CONN_NO_LINK);
-        }
       }
       break;
 
@@ -1122,42 +1115,23 @@ static void l2c_csm_open(tL2C_CCB* p_ccb, uint16_t event, void* p_data) {
  ******************************************************************************/
 static void l2c_csm_w4_l2cap_disconnect_rsp(tL2C_CCB* p_ccb, uint16_t event,
                                             void* p_data) {
-  tL2CA_DISCONNECT_CFM_CB* disconnect_cfm =
-      p_ccb->p_rcb->api.pL2CA_DisconnectCfm_Cb;
-  uint16_t local_cid = p_ccb->local_cid;
-
   L2CAP_TRACE_EVENT("L2CAP - LCID: 0x%04x  st: W4_L2CAP_DISC_RSP  evt: %s",
                     p_ccb->local_cid, l2c_csm_get_event_name(event));
 
   switch (event) {
     case L2CEVT_L2CAP_DISCONNECT_RSP: /* Peer disconnect response */
       l2cu_release_ccb(p_ccb);
-      if (disconnect_cfm) {
-        L2CAP_TRACE_API("L2CAP - Calling DisconnectCfm_Cb(), CID: 0x%04x",
-                        local_cid);
-        (*disconnect_cfm)(local_cid, L2CAP_DISC_OK);
-      }
       break;
 
     case L2CEVT_L2CAP_DISCONNECT_REQ: /* Peer disconnect request  */
       l2cu_send_peer_disc_rsp(p_ccb->p_lcb, p_ccb->remote_id, p_ccb->local_cid,
                               p_ccb->remote_cid);
       l2cu_release_ccb(p_ccb);
-      if (disconnect_cfm) {
-        L2CAP_TRACE_API("L2CAP - Calling DisconnectCfm_Cb(), CID: 0x%04x",
-                        local_cid);
-        (*disconnect_cfm)(local_cid, L2CAP_DISC_OK);
-      }
       break;
 
     case L2CEVT_LP_DISCONNECT_IND: /* Link was disconnected */
     case L2CEVT_TIMEOUT:           /* Timeout */
       l2cu_release_ccb(p_ccb);
-      if (disconnect_cfm) {
-        L2CAP_TRACE_API("L2CAP - Calling DisconnectCfm_Cb(), CID: 0x%04x",
-                        local_cid);
-        (*disconnect_cfm)(local_cid, L2CAP_DISC_TIMEOUT);
-      }
       break;
 
     case L2CEVT_L2CAP_DATA:      /* Peer data packet rcvd    */

diff --git a/stack/rfcomm/rfc_l2cap_if.cc b/stack/rfcomm/rfc_l2cap_if.cc
index 9cf93ff..7ba153e 100644 (file)
--- a/stack/rfcomm/rfc_l2cap_if.cc
+++ b/stack/rfcomm/rfc_l2cap_if.cc
@@ -66,7 +66,6 @@ void rfcomm_l2cap_if_init(void) {
   p_l2c->pL2CA_ConfigInd_Cb = RFCOMM_ConfigInd;
   p_l2c->pL2CA_ConfigCfm_Cb = RFCOMM_ConfigCnf;
   p_l2c->pL2CA_DisconnectInd_Cb = RFCOMM_DisconnectInd;
-  p_l2c->pL2CA_DisconnectCfm_Cb = NULL;
   p_l2c->pL2CA_DataInd_Cb = RFCOMM_BufDataInd;
   p_l2c->pL2CA_CongestionStatus_Cb = RFCOMM_CongestionStatusInd;
   p_l2c->pL2CA_TxComplete_Cb = NULL;