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

Commit 29251dbd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move some contents into btm_acl_connected" am: f84a7b7b am: e227cd47 

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

Change-Id: I6d84d22411cd4de97dc353dfe51383e326fd9138
parents 0dd3f373 e227cd47

system/stack/l2cap/l2c_link.cc

+2 −12
Original line number Diff line number Diff line
@@ -134,19 +134,11 @@ 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);



  l2c_link_hci_conn_comp(status, handle, bda);

}



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

 *

 * Function         l2c_link_hci_conn_comp

 *

 * Description      This function is called when an HCI Connection Complete

 *                  event is received.

 *

 * Returns          void

 *

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

void l2c_link_hci_conn_comp(uint8_t status, uint16_t handle,

                            const RawAddress& p_bda) {

  tL2C_CONN_INFO ci;
@@ -154,8 +146,6 @@ void l2c_link_hci_conn_comp(uint8_t status, uint16_t handle, 
  tL2C_CCB* p_ccb;

  tBTM_SEC_DEV_REC* p_dev_info = NULL;



  btm_acl_update_busy_level(BTM_BLI_PAGE_DONE_EVT);



  /* Save the parameters */

  ci.status = status;

  ci.bd_addr = p_bda;