From 75b25c50b647e8f225cc3dc95b3e92977c77ea2b Mon Sep 17 00:00:00 2001
From: Hansong Zhang <hsz@google.com>
Date: Tue, 22 Sep 2020 22:07:03 -0700
Subject: [PATCH] AVDT: Move L2cap disconnect logic together

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ice0c606bbaf3467cbbf7cedd266765874d760e66
---
 stack/avdt/avdt_ad.cc  |  3 ++-
 stack/avdt/avdt_int.h  |  2 ++
 stack/avdt/avdt_l2c.cc | 23 ++++++-----------------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/stack/avdt/avdt_ad.cc b/stack/avdt/avdt_ad.cc
index 08598abdb..c6a508f91 100644
--- a/stack/avdt/avdt_ad.cc
+++ b/stack/avdt/avdt_ad.cc
@@ -603,6 +603,7 @@ void avdt_ad_close_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb) {
       tcid = avdt_ad_type_to_tcid(type, p_scb);
 
       /* call l2cap disconnect req */
-      L2CA_DisconnectReq(avdtp_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][tcid].lcid);
+      avdt_l2c_disconnect(
+          avdtp_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][tcid].lcid);
   }
 }
diff --git a/stack/avdt/avdt_int.h b/stack/avdt/avdt_int.h
index 64b308b89..504fa0522 100644
--- a/stack/avdt/avdt_int.h
+++ b/stack/avdt/avdt_int.h
@@ -1003,4 +1003,6 @@ extern const tL2CAP_APPL_INFO avdt_l2c_appl;
 /* reject message event lookup table */
 extern const uint8_t avdt_msg_rej_2_evt[];
 
+void avdt_l2c_disconnect(uint16_t lcid);
+
 #endif /* AVDT_INT_H */
diff --git a/stack/avdt/avdt_l2c.cc b/stack/avdt/avdt_l2c.cc
index f842ae8f7..272b4c025 100644
--- a/stack/avdt/avdt_l2c.cc
+++ b/stack/avdt/avdt_l2c.cc
@@ -43,7 +43,6 @@ void avdt_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result);
 void avdt_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg);
 void avdt_l2c_config_ind_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg);
 void avdt_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed);
-void avdt_l2c_disconnect_cfm_cback(uint16_t lcid, uint16_t result);
 void avdt_l2c_congestion_ind_cback(uint16_t lcid, bool is_congested);
 void avdt_l2c_data_ind_cback(uint16_t lcid, BT_HDR* p_buf);
 
@@ -53,7 +52,7 @@ 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,
-                                        avdt_l2c_disconnect_cfm_cback,
+                                        NULL,
                                         avdt_l2c_data_ind_cback,
                                         avdt_l2c_congestion_ind_cback,
                                         NULL,
@@ -145,7 +144,7 @@ static void avdt_sec_check_complete_orig(const RawAddress* bd_addr,
     cfg.flush_to = p_tbl->my_flush_to;
     L2CA_ConfigReq(p_tbl->lcid, &cfg);
   } else {
-    L2CA_DisconnectReq(p_tbl->lcid);
+    avdt_l2c_disconnect(p_tbl->lcid);
     avdt_ad_tc_close_ind(p_tbl);
   }
 }
@@ -361,7 +360,7 @@ void avdt_l2c_config_cfm_cback(uint16_t lcid, tL2CAP_CFG_INFO* p_cfg) {
       /* else failure */
       else {
         /* Send L2CAP disconnect req */
-        L2CA_DisconnectReq(lcid);
+        avdt_l2c_disconnect(lcid);
       }
     }
   }
@@ -434,21 +433,11 @@ void avdt_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed) {
   }
 }
 
-/*******************************************************************************
- *
- * Function         avdt_l2c_disconnect_cfm_cback
- *
- * Description      This is the L2CAP disconnect confirm callback function.
- *
- *
- * Returns          void
- *
- ******************************************************************************/
-void avdt_l2c_disconnect_cfm_cback(uint16_t lcid, uint16_t result) {
+void avdt_l2c_disconnect(uint16_t lcid) {
+  L2CA_DisconnectReq(lcid);
   AvdtpTransportChannel* p_tbl;
 
-  AVDT_TRACE_DEBUG("avdt_l2c_disconnect_cfm_cback lcid: %d, result: %d", lcid,
-                   result);
+  AVDT_TRACE_DEBUG("avdt_l2c_disconnect_cfm_cback lcid: %d", lcid);
   /* look up info for this channel */
   p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);
   if (p_tbl != NULL) {
-- 
2.11.0