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

Commit 58786712 authored by Wei-Luan Wang's avatar Wei-Luan Wang Committed by Gerrit Code Review
Browse files

Merge "floss: Migrate base::Bind for do_in_main_thread"

parents 082badd5 26ec03c9

system/bta/ag/bta_ag_api.cc

+26 −22
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_CBACK* p_cback) { 
    }

  }

  bta_sys_register(BTA_ID_AG, &bta_ag_reg);

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_api_enable, p_cback));

  do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_api_enable, p_cback));

  return BTA_SUCCESS;

}
@@ -81,7 +81,7 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_CBACK* p_cback) { 
 *

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

void BTA_AgDisable() {

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_api_disable));

  do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_api_disable));

}



/*******************************************************************************
@@ -97,7 +97,7 @@ void BTA_AgDisable() { 
void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features,

                    const std::vector<std::string>& service_names,

                    uint8_t app_id) {

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_api_register, services,

  do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_api_register, services,

                                              features, service_names, app_id));

}
@@ -112,9 +112,9 @@ void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features, 
 *

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

void BTA_AgDeregister(uint16_t handle) {

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

                            BTA_AG_API_DEREGISTER_EVT, tBTA_AG_DATA::kEmpty));

  do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_sm_execute_by_handle,

                                              handle, BTA_AG_API_DEREGISTER_EVT,

                                              tBTA_AG_DATA::kEmpty));

}



/*******************************************************************************
@@ -133,7 +133,8 @@ void BTA_AgDeregister(uint16_t handle) { 
void BTA_AgOpen(uint16_t handle, const RawAddress& bd_addr) {

  tBTA_AG_DATA data = {};

  data.api_open.bd_addr = bd_addr;

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

  do_in_main_thread(FROM_HERE,

                    base::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                   BTA_AG_API_OPEN_EVT, data));

}
@@ -150,7 +151,7 @@ void BTA_AgOpen(uint16_t handle, const RawAddress& bd_addr) { 
 ******************************************************************************/

void BTA_AgClose(uint16_t handle) {

  do_in_main_thread(FROM_HERE,

                    base::Bind(&bta_ag_sm_execute_by_handle, handle,

                    base::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                   BTA_AG_API_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

}
@@ -171,7 +172,8 @@ void BTA_AgClose(uint16_t handle) { 
void BTA_AgAudioOpen(uint16_t handle, tBTA_AG_PEER_CODEC disabled_codecs) {

  tBTA_AG_DATA data = {};

  data.api_audio_open.disabled_codecs = disabled_codecs;

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

  do_in_main_thread(FROM_HERE,

                    base::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                   BTA_AG_API_AUDIO_OPEN_EVT, data));

}
@@ -188,7 +190,8 @@ void BTA_AgAudioOpen(uint16_t handle, tBTA_AG_PEER_CODEC disabled_codecs) { 
 ******************************************************************************/

void BTA_AgAudioClose(uint16_t handle) {

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

      FROM_HERE,

      base::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                     BTA_AG_API_AUDIO_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

}
@@ -207,7 +210,7 @@ void BTA_AgAudioClose(uint16_t handle) { 
void BTA_AgResult(uint16_t handle, tBTA_AG_RES result,

                  const tBTA_AG_RES_DATA& data) {

  do_in_main_thread(FROM_HERE,

                    base::Bind(&bta_ag_api_result, handle, result, data));

                    base::BindOnce(&bta_ag_api_result, handle, result, data));

}



/*******************************************************************************
@@ -225,20 +228,21 @@ void BTA_AgResult(uint16_t handle, tBTA_AG_RES result, 
void BTA_AgSetCodec(uint16_t handle, tBTA_AG_PEER_CODEC codec) {

  tBTA_AG_DATA data = {};

  data.api_setcodec.codec = codec;

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle,

  do_in_main_thread(FROM_HERE,

                    base::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                   BTA_AG_API_SETCODEC_EVT, data));

}



void BTA_AgSetScoOffloadEnabled(bool value) {

  do_in_main_thread(FROM_HERE,

                    base::Bind(&bta_ag_set_sco_offload_enabled, value));

                    base::BindOnce(&bta_ag_set_sco_offload_enabled, value));

}



void BTA_AgSetScoAllowed(bool value) {

  do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_set_sco_allowed, value));

  do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_set_sco_allowed, value));

}



void BTA_AgSetActiveDevice(const RawAddress& active_device_addr) {

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_api_set_active_device, active_device_addr));

  do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_api_set_active_device,

                                              active_device_addr));

}

system/bta/ag/bta_ag_rfc.cc

+7 −7
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ static void bta_ag_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle, 
                 << handle << " peer_addr " << p_scb->peer_addr << " state "

                 << std::to_string(p_scb->state);

    }

    do_in_main_thread(FROM_HERE,

                      base::Bind(&bta_ag_sm_execute_by_handle, handle,

    do_in_main_thread(

        FROM_HERE, base::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                  BTA_AG_RFC_DATA_EVT, tBTA_AG_DATA::kEmpty));

  }

}
@@ -152,8 +152,8 @@ static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle, 


  tBTA_AG_DATA data = {};

  data.rfc.port_handle = port_handle;

  do_in_main_thread(

      FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, handle, event, data));

  do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_sm_execute_by_handle,

                                              handle, event, data));

}



/*******************************************************************************
@@ -367,7 +367,7 @@ void bta_ag_rfc_do_close(tBTA_AG_SCB* p_scb, 
    /* and move back to INIT state.                                     */

    do_in_main_thread(

        FROM_HERE,

        base::Bind(&bta_ag_sm_execute_by_handle, bta_ag_scb_to_idx(p_scb),

        base::BindOnce(&bta_ag_sm_execute_by_handle, bta_ag_scb_to_idx(p_scb),

                       BTA_AG_RFC_CLOSE_EVT, tBTA_AG_DATA::kEmpty));



    /* Cancel SDP if it had been started. */

system/bta/ag/bta_ag_sco.cc

+9 −9
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ static void bta_ag_sco_conn_cback(uint16_t sco_idx) { 
  }



  if (handle != 0) {

    do_in_main_thread(FROM_HERE,

                      base::Bind(&bta_ag_sm_execute_by_handle, handle,

    do_in_main_thread(

        FROM_HERE, base::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                  BTA_AG_SCO_OPEN_EVT, tBTA_AG_DATA::kEmpty));

  } else {

    /* no match found; disconnect sco, init sco variables */
@@ -243,8 +243,8 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 


    bta_ag_cb.sco.p_curr_scb->inuse_codec = BTM_SCO_CODEC_NONE;



    do_in_main_thread(FROM_HERE,

                      base::Bind(&bta_ag_sm_execute_by_handle, handle,

    do_in_main_thread(

        FROM_HERE, base::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                  BTA_AG_SCO_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

  } else {

    /* no match found */
@@ -386,8 +386,8 @@ static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { 
                 << " is not active, active_device=" << active_device_addr;

    if (bta_ag_cb.sco.p_curr_scb != nullptr &&

        bta_ag_cb.sco.p_curr_scb->in_use && p_scb == bta_ag_cb.sco.p_curr_scb) {

      do_in_main_thread(

          FROM_HERE, base::Bind(&bta_ag_sm_execute, p_scb, BTA_AG_SCO_CLOSE_EVT,

      do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_sm_execute, p_scb,

                                                  BTA_AG_SCO_CLOSE_EVT,

                                                  tBTA_AG_DATA::kEmpty));

    }

    return;

system/bta/ag/bta_ag_sdp.cc

+2 −2
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ static void bta_ag_sdp_cback(uint16_t status, uint8_t idx) { 
      event = BTA_AG_DISC_INT_RES_EVT;

    }

    tBTA_AG_DATA disc_result = {.disc_result = {.status = status}};

    do_in_main_thread(FROM_HERE, base::Bind(&bta_ag_sm_execute_by_handle, idx,

                                            event, disc_result));

    do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_sm_execute_by_handle,

                                                idx, event, disc_result));

  }

}

system/bta/dm/bta_dm_act.cc

+9 −8
Original line number Diff line number Diff line
@@ -2727,8 +2727,8 @@ static void handle_role_change(const RawAddress& bd_addr, tHCI_ROLE new_role, 


void BTA_dm_report_role_change(const RawAddress bd_addr, tHCI_ROLE new_role,

                               tHCI_STATUS hci_status) {

  do_in_main_thread(

      FROM_HERE, base::Bind(handle_role_change, bd_addr, new_role, hci_status));

  do_in_main_thread(FROM_HERE, base::BindOnce(handle_role_change, bd_addr,

                                              new_role, hci_status));

}



void handle_remote_features_complete(const RawAddress& bd_addr) {
@@ -2751,7 +2751,7 @@ void handle_remote_features_complete(const RawAddress& bd_addr) { 


void BTA_dm_notify_remote_features_complete(const RawAddress bd_addr) {

  do_in_main_thread(FROM_HERE,

                    base::Bind(handle_remote_features_complete, bd_addr));

                    base::BindOnce(handle_remote_features_complete, bd_addr));

}



static tBTA_DM_PEER_DEVICE* allocate_device_for(const RawAddress& bd_addr,
@@ -2814,8 +2814,8 @@ void bta_dm_acl_up(const RawAddress& bd_addr, tBT_TRANSPORT transport, 


void BTA_dm_acl_up(const RawAddress bd_addr, tBT_TRANSPORT transport,

                   uint16_t acl_handle) {

  do_in_main_thread(FROM_HERE,

                    base::Bind(bta_dm_acl_up, bd_addr, transport, acl_handle));

  do_in_main_thread(

      FROM_HERE, base::BindOnce(bta_dm_acl_up, bd_addr, transport, acl_handle));

}



static void bta_dm_acl_up_failed(const RawAddress bd_addr,
@@ -2831,8 +2831,8 @@ static void bta_dm_acl_up_failed(const RawAddress bd_addr, 


void BTA_dm_acl_up_failed(const RawAddress bd_addr, tBT_TRANSPORT transport,

                          tHCI_STATUS status) {

  do_in_main_thread(

      FROM_HERE, base::Bind(bta_dm_acl_up_failed, bd_addr, transport, status));

  do_in_main_thread(FROM_HERE, base::BindOnce(bta_dm_acl_up_failed, bd_addr,

                                              transport, status));

}



static void bta_dm_acl_down(const RawAddress& bd_addr,
@@ -2917,7 +2917,8 @@ static void bta_dm_acl_down(const RawAddress& bd_addr, 
}



void BTA_dm_acl_down(const RawAddress bd_addr, tBT_TRANSPORT transport) {

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_acl_down, bd_addr, transport));

  do_in_main_thread(FROM_HERE,

                    base::BindOnce(bta_dm_acl_down, bd_addr, transport));

}



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