commit a7a92166b94b23f0ae916b0e029c561f78102ac9
author Chris Manton <cmanton@google.com> Mon Sep 07 21:51:26 2020 -0700
committer Chris Manton <cmanton@google.com> Thu Sep 10 05:22:49 2020 +0000
tree 618c080d62e2d74982e859e54f1a82a063ffe821
parent c7e135b0b3e90eb00e750e97c0322689149355d7

Properly include stack/include/acl_api

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I9e1e9271055924568b1c315c8e550c49a38bf32b

system/btif/src/stack_manager.cc

diff --git a/system/btif/src/stack_manager.cc b/system/btif/src/stack_manager.cc
index 7c078cd..f3d7294 100644
--- a/system/btif/src/stack_manager.cc
+++ b/system/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

system/stack/btm/btm_inq.cc

diff --git a/system/stack/btm/btm_inq.cc b/system/stack/btm/btm_inq.cc
index 40c0e60..dd7e67e 100644
--- a/system/stack/btm/btm_inq.cc
+++ b/system/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;
 

system/stack/btm/btm_main.cc

diff --git a/system/stack/btm/btm_main.cc b/system/stack/btm/btm_main.cc
index 5410e6d..bb19440 100644
--- a/system/stack/btm/btm_main.cc
+++ b/system/stack/btm/btm_main.cc
@@ -32,6 +32,8 @@
 */
 tBTM_CB btm_cb;
 
+void btm_acl_init(void);
+
 /*******************************************************************************
  *
  * Function         btm_init

system/stack/include/acl_api.h

diff --git a/system/stack/include/acl_api.h b/system/stack/include/acl_api.h
index 6229069..cda4d59 100644
--- a/system/stack/include/acl_api.h
+++ b/system/stack/include/acl_api.h
@@ -337,3 +337,17 @@
                     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);