Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a41ffbe authored by Zach Johnson's avatar Zach Johnson Committed by Automerger Merge Worker
Browse files

Replace BTM_BLI_PAGE_EVT & BTM_BLI_PAGE_DONE_EVT with btm_acl_set_paging am: a66af2aa 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1393890

Change-Id: I74a098e04ff2dd1e71c2c837220d63e8bf377ac6
parents 114101e5 a66af2aa

system/stack/acl/btm_acl.cc

+2 −8
Original line number Diff line number Diff line
@@ -437,6 +437,8 @@ void btm_acl_device_down(void) { 
  }

}



void btm_acl_set_paging(bool value) { btm_cb.is_paging = value; }



/*******************************************************************************

 *

 * Function         btm_acl_update_busy_level
@@ -452,14 +454,6 @@ void btm_acl_update_busy_level(tBTM_BLI_EVENT event) { 
  tBTM_BL_UPDATE_DATA evt;

  evt.busy_level_flags = 0;

  switch (event) {

    case BTM_BLI_PAGE_EVT:

      BTM_TRACE_DEBUG("BTM_BLI_PAGE_EVT");

      btm_cb.is_paging = true;

      break;

    case BTM_BLI_PAGE_DONE_EVT:

      BTM_TRACE_DEBUG("BTM_BLI_PAGE_DONE_EVT");

      btm_cb.is_paging = false;

      break;

    case BTM_BLI_INQ_EVT:

      BTM_TRACE_DEBUG("BTM_BLI_INQ_EVT");

      btm_cb.is_inquiry = true;

system/stack/btm/btm_int.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ extern void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn, 
                            tBT_TRANSPORT transport);

extern void btm_acl_removed(const RawAddress& bda, tBT_TRANSPORT transport);

extern void btm_acl_device_down(void);

extern void btm_acl_set_paging(bool value);

extern void btm_acl_update_busy_level(tBTM_BLI_EVENT event);



extern void btm_cont_rswitch(tACL_CONN* p, tBTM_SEC_DEV_REC* p_dev_rec,

system/stack/btm/btm_int_types.h

+0 −2
Original line number Diff line number Diff line
@@ -562,8 +562,6 @@ typedef struct { 
} tBTM_PM_RCB;



enum {

  BTM_BLI_PAGE_EVT,

  BTM_BLI_PAGE_DONE_EVT,

  BTM_BLI_INQ_EVT,

  BTM_BLI_INQ_CANCEL_EVT,

  BTM_BLI_INQ_DONE_EVT

system/stack/l2cap/l2c_link.cc

+2 −4
Original line number Diff line number Diff line
@@ -133,9 +133,7 @@ bool l2c_link_hci_conn_req(const RawAddress& bd_addr) { 
void btm_acl_connected(const RawAddress& bda, uint16_t handle, uint8_t status,

                       uint8_t enc_mode) {

  btm_sec_connected(bda, handle, status, enc_mode);



  btm_acl_update_busy_level(BTM_BLI_PAGE_DONE_EVT);



  btm_acl_set_paging(false);

  l2c_link_hci_conn_comp(status, handle, bda);

}
@@ -1309,7 +1307,7 @@ tBTM_STATUS l2cu_ConnectAclForSecurity(const RawAddress& bd_addr) { 
  }



  l2cu_create_conn_br_edr(p_lcb);

  btm_acl_update_busy_level(BTM_BLI_PAGE_EVT);

  btm_acl_set_paging(true);

  return BTM_SUCCESS;

}

system/stack/l2cap/l2c_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -2186,7 +2186,7 @@ void l2cu_create_conn_after_switch(tL2C_LCB* p_lcb) { 
                              HCI_PKT_TYPES_MASK_DM5 | HCI_PKT_TYPES_MASK_DH5),

      page_scan_rep_mode, page_scan_mode, clock_offset, allow_switch);



  btm_acl_update_busy_level(BTM_BLI_PAGE_EVT);

  btm_acl_set_paging(true);



  alarm_set_on_mloop(p_lcb->l2c_lcb_timer, L2CAP_LINK_CONNECT_TIMEOUT_MS,

                     l2c_lcb_timer_timeout, p_lcb);