From 66af1610d8fc8bd588121c5ae7a9ab5e34a9e185 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Mon, 7 Sep 2020 21:51:26 -0700
Subject: [PATCH] Properly include stack/include/acl_api

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9e1e9271055924568b1c315c8e550c49a38bf32b
---
 btif/src/stack_manager.cc |  1 +
 stack/btm/btm_inq.cc      |  1 +
 stack/btm/btm_main.cc     |  2 ++
 stack/include/acl_api.h   | 14 ++++++++++++++
 4 files changed, 18 insertions(+)

diff --git a/btif/src/stack_manager.cc b/btif/src/stack_manager.cc
index 7c078cd17..f3d729465 100644
--- a/btif/src/stack_manager.cc
+++ b/btif/src/stack_manager.cc
@@ -33,6 +33,7 @@
 #include "osi/include/log.h"
 #include "osi/include/osi.h"
 #include "osi/include/semaphore.h"
+#include "stack/include/acl_api.h"
 #include "stack/include/btu.h"
 
 // Temp includes
diff --git a/stack/btm/btm_inq.cc b/stack/btm/btm_inq.cc
index 40c0e60a7..dd7e67e4d 100644
--- a/stack/btm/btm_inq.cc
+++ b/stack/btm/btm_inq.cc
@@ -45,6 +45,7 @@
 #include "hcimsgs.h"
 #include "main/shim/btm_api.h"
 #include "main/shim/shim.h"
+#include "stack/include/acl_api.h"
 
 using bluetooth::Uuid;
 
diff --git a/stack/btm/btm_main.cc b/stack/btm/btm_main.cc
index 5410e6d93..bb1944026 100644
--- a/stack/btm/btm_main.cc
+++ b/stack/btm/btm_main.cc
@@ -32,6 +32,8 @@
 */
 tBTM_CB btm_cb;
 
+void btm_acl_init(void);
+
 /*******************************************************************************
  *
  * Function         btm_init
diff --git a/stack/include/acl_api.h b/stack/include/acl_api.h
index 62290696c..cda4d59c8 100644
--- a/stack/include/acl_api.h
+++ b/stack/include/acl_api.h
@@ -337,3 +337,17 @@ void acl_disconnect(const RawAddress& bd_addr, tBT_TRANSPORT transport,
                     uint8_t reason);
 
 bool acl_peer_supports_sniff_subrating(const RawAddress& remote_bda);
+
+void btm_acl_set_paging(bool value);
+
+void btm_process_cancel_complete(uint8_t status, uint8_t mode);
+
+uint8_t btm_handle_to_acl_index(uint16_t hci_handle);
+
+uint16_t btm_get_acl_disc_reason_code(void);
+
+extern tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr,
+                                  tBT_TRANSPORT transport);
+
+void btm_acl_device_down(void);
+void btm_acl_update_inquiry_status(uint8_t status);
-- 
2.11.0