From ab57a1497c9960707fe614de57fdf149d12945b3 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Mon, 5 Oct 2020 13:49:56 -0700
Subject: [PATCH] Move _process_num_completed_pkts into acl

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: Ie2237ad8b5ed76c024276a5c2db63c0809c680d9
---
 stack/acl/btm_acl.cc                     | 6 ++++++
 stack/btu/btu_hcif.cc                    | 3 +--
 stack/include/acl_hci_link_interface.h   | 1 +
 stack/include/l2cap_acl_interface.h      | 2 ++
 stack/include/l2cap_hci_link_interface.h | 2 --
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/stack/acl/btm_acl.cc b/stack/acl/btm_acl.cc
index a3e420a35..e9897122d 100644
--- a/stack/acl/btm_acl.cc
+++ b/stack/acl/btm_acl.cc
@@ -55,6 +55,7 @@
 #include "stack/include/acl_api.h"
 #include "stack/include/acl_hci_link_interface.h"
 #include "stack/include/btm_api.h"
+#include "stack/include/btm_iso_api.h"
 #include "stack/include/btu.h"
 #include "stack/include/hcimsgs.h"
 #include "stack/include/l2cap_acl_interface.h"
@@ -2893,3 +2894,8 @@ void acl_rcv_acl_data(BT_HDR* p_msg) {
 void acl_link_segments_xmitted(BT_HDR* p_msg) {
   l2c_link_segments_xmitted(p_msg);
 }
+
+void acl_process_num_completed_pkts(uint8_t* p, uint8_t evt_len) {
+  l2c_link_process_num_completed_pkts(p, evt_len);
+  bluetooth::hci::IsoManager::GetInstance()->HandleNumComplDataPkts(p, evt_len);
+}
diff --git a/stack/btu/btu_hcif.cc b/stack/btu/btu_hcif.cc
index 35f48c6e3..7fe79849c 100644
--- a/stack/btu/btu_hcif.cc
+++ b/stack/btu/btu_hcif.cc
@@ -324,8 +324,7 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) {
       btu_hcif_role_change_evt(p);
       break;
     case HCI_NUM_COMPL_DATA_PKTS_EVT:
-      l2c_link_process_num_completed_pkts(p, hci_evt_len);
-      IsoManager::GetInstance()->HandleNumComplDataPkts(p, hci_evt_len);
+      acl_process_num_completed_pkts(p, hci_evt_len);
       break;
     case HCI_MODE_CHANGE_EVT:
       btu_hcif_mode_change_evt(p);
diff --git a/stack/include/acl_hci_link_interface.h b/stack/include/acl_hci_link_interface.h
index 1f30e4084..c6d9da413 100644
--- a/stack/include/acl_hci_link_interface.h
+++ b/stack/include/acl_hci_link_interface.h
@@ -51,3 +51,4 @@ void btm_read_tx_power_complete(uint8_t* p, bool is_ble);
 
 void acl_rcv_acl_data(BT_HDR* p_msg);
 void acl_link_segments_xmitted(BT_HDR* p_msg);
+void acl_process_num_completed_pkts(uint8_t* p, uint8_t evt_len);
diff --git a/stack/include/l2cap_acl_interface.h b/stack/include/l2cap_acl_interface.h
index 318540951..421c7e7c8 100644
--- a/stack/include/l2cap_acl_interface.h
+++ b/stack/include/l2cap_acl_interface.h
@@ -43,3 +43,5 @@ extern void l2c_link_segments_xmitted(BT_HDR* p_msg);
 extern void l2c_link_hci_conn_req(const RawAddress& bd_addr);
 
 extern void l2cu_resubmit_pending_sec_req(const RawAddress* p_bda);
+
+extern void l2c_link_process_num_completed_pkts(uint8_t* p, uint8_t evt_len);
diff --git a/stack/include/l2cap_hci_link_interface.h b/stack/include/l2cap_hci_link_interface.h
index 7d97f63d2..63290fe67 100644
--- a/stack/include/l2cap_hci_link_interface.h
+++ b/stack/include/l2cap_hci_link_interface.h
@@ -21,8 +21,6 @@
 
 // This header contains functions for HCI-LinkManagement to invoke
 
-extern void l2c_link_process_num_completed_pkts(uint8_t* p, uint8_t evt_len);
-
 extern void l2c_link_hci_conn_comp(uint8_t status, uint16_t handle,
                                    const RawAddress& p_bda);
 
-- 
2.11.0