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

Commit 9de212dc authored by Zach Johnson's avatar Zach Johnson
Browse files

Encapsulate acl_state_changed_cb 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2e5cf68cd8eaa1b1f3bea207cb4680ee025a3dee
parent 31cea6c3

system/btif/include/btif_common.h

+2 −0
Original line number Diff line number Diff line
@@ -211,5 +211,7 @@ void invoke_ssp_request_cb(RawAddress bd_addr, bt_bdname_t bd_name, 
                           uint32_t pass_key);

void invoke_bond_state_changed_cb(bt_status_t status, RawAddress bd_addr,

                                  bt_bond_state_t state);

void invoke_acl_state_changed_cb(bt_status_t status, RawAddress bd_addr,

                                 bt_acl_state_t state);



#endif /* BTIF_COMMON_H */

system/btif/src/bluetooth.cc

+12 −0
Original line number Diff line number Diff line
@@ -710,3 +710,15 @@ void invoke_bond_state_changed_cb(bt_status_t status, RawAddress bd_addr, 
          },

          status, bd_addr, state));

}



void invoke_acl_state_changed_cb(bt_status_t status, RawAddress bd_addr,

                                 bt_acl_state_t state) {

  do_in_jni_thread(

      FROM_HERE,

      base::BindOnce(

          [](bt_status_t status, RawAddress bd_addr, bt_acl_state_t state) {

            HAL_CBACK(bt_hal_cbacks, acl_state_changed_cb, status, &bd_addr,

                      state);

          },

          status, bd_addr, state));

}

system/btif/src/btif_dm.cc

+4 −4
Original line number Diff line number Diff line
@@ -1749,8 +1749,8 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 


      btif_update_remote_version_property(&bd_addr);



      HAL_CBACK(bt_hal_cbacks, acl_state_changed_cb, BT_STATUS_SUCCESS,

                &bd_addr, BT_ACL_STATE_CONNECTED);

      invoke_acl_state_changed_cb(BT_STATUS_SUCCESS, bd_addr,

                                  BT_ACL_STATE_CONNECTED);

      break;



    case BTA_DM_LINK_DOWN_EVT:
@@ -1759,8 +1759,8 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { 
      btif_av_acl_disconnected(bd_addr);

      BTIF_TRACE_DEBUG(

          "BTA_DM_LINK_DOWN_EVT. Sending BT_ACL_STATE_DISCONNECTED");

      HAL_CBACK(bt_hal_cbacks, acl_state_changed_cb, BT_STATUS_SUCCESS,

                &bd_addr, BT_ACL_STATE_DISCONNECTED);

      invoke_acl_state_changed_cb(BT_STATUS_SUCCESS, bd_addr,

                                  BT_ACL_STATE_DISCONNECTED);

      break;



    case BTA_DM_BLE_KEY_EVT: