commit 79df2cab4f39278e2fd362432aed4cf8a40473db
author Chris Manton <cmanton@google.com> Sun Jan 17 09:11:41 2021 -0800
committer Chris Manton <cmanton@google.com> Wed Jan 20 08:05:28 2021 -0800
tree 9d25185314088538d34f9eef04d04478f7e3abd6
parent 0a8928921f1dd36cef9141e626f475bcbb65e7cb

Encapsulate tACL_CONN::role_switch

Towards encapsulated code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run

Change-Id: Iedc4254e3c8085257c906a5a78754fc366747c44

system/stack/acl/acl.h

diff --git a/system/stack/acl/acl.h b/system/stack/acl/acl.h
index 88a0b2b..e02db2e 100644
--- a/system/stack/acl/acl.h
+++ b/system/stack/acl/acl.h
@@ -251,7 +251,19 @@
 #define BTM_SEC_RS_NOT_PENDING 0 /* Role Switch not in progress */
 #define BTM_SEC_RS_PENDING 1     /* Role Switch in progress */
 #define BTM_SEC_DISC_PENDING 2   /* Disconnect is pending */
+ private:
   uint8_t rs_disc_pending = BTM_SEC_RS_NOT_PENDING;
+  friend struct StackAclBtmAcl;
+  friend tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr,
+                                    tBT_TRANSPORT transport);
+  friend void acl_disconnect_after_role_switch(uint16_t conn_handle,
+                                               tHCI_STATUS reason);
+  friend void bluetooth::shim::btm_pm_on_mode_change(tHCI_STATUS status,
+                                                     uint16_t handle,
+                                                     tHCI_MODE hci_mode,
+                                                     uint16_t interval);
+  friend void btm_acl_encrypt_change(uint16_t handle, uint8_t status,
+                                     uint8_t encr_enable);
 
  public:
   bool is_disconnect_pending() const {