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

Commit 22376cf5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "system: Remove location parameter from do_in_main_thread" into main am:... 

Merge "system: Remove location parameter from do_in_main_thread" into main am: 602c2457 am: a29fcf34

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3166137



Change-Id: I8742f9526ef3a7e162fe5ba6b53e7effa582bfa0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0e5b3a9 a29fcf34

system/bta/ag/bta_ag_api.cc

+21 −21
Original line number Diff line number Diff line
@@ -69,7 +69,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::BindOnce(&bta_ag_api_enable, p_cback));

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

  return BTA_SUCCESS;

}
@@ -83,7 +83,7 @@ tBTA_STATUS BTA_AgEnable(tBTA_AG_CBACK* p_cback) { 
 * Returns          void

 *

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

void BTA_AgDisable() { do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_api_disable)); }

void BTA_AgDisable() { do_in_main_thread(base::BindOnce(&bta_ag_api_disable)); }



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

 *
@@ -97,8 +97,8 @@ void BTA_AgDisable() { do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_api_d 
 ******************************************************************************/

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::BindOnce(&bta_ag_api_register, services, features,

                                              service_names, app_id));

  do_in_main_thread(

          base::BindOnce(&bta_ag_api_register, services, features, service_names, app_id));

}



/*******************************************************************************
@@ -112,8 +112,8 @@ void BTA_AgRegister(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features, 
 *

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

void BTA_AgDeregister(uint16_t handle) {

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

                                              BTA_AG_API_DEREGISTER_EVT, tBTA_AG_DATA::kEmpty));

  do_in_main_thread(base::BindOnce(&bta_ag_sm_execute_by_handle, handle, BTA_AG_API_DEREGISTER_EVT,

                                   tBTA_AG_DATA::kEmpty));

}



/*******************************************************************************
@@ -132,8 +132,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::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                              BTA_AG_API_OPEN_EVT, data));

  do_in_main_thread(

          base::BindOnce(&bta_ag_sm_execute_by_handle, handle, BTA_AG_API_OPEN_EVT, data));

}



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

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

void BTA_AgClose(uint16_t handle) {

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

                                              BTA_AG_API_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

  do_in_main_thread(base::BindOnce(&bta_ag_sm_execute_by_handle, handle, BTA_AG_API_CLOSE_EVT,

                                   tBTA_AG_DATA::kEmpty));

}



/*******************************************************************************
@@ -169,8 +169,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::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                              BTA_AG_API_AUDIO_OPEN_EVT, data));

  do_in_main_thread(

          base::BindOnce(&bta_ag_sm_execute_by_handle, handle, BTA_AG_API_AUDIO_OPEN_EVT, data));

}



/*******************************************************************************
@@ -185,8 +185,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::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                              BTA_AG_API_AUDIO_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

  do_in_main_thread(base::BindOnce(&bta_ag_sm_execute_by_handle, handle, BTA_AG_API_AUDIO_CLOSE_EVT,

                                   tBTA_AG_DATA::kEmpty));

}



/*******************************************************************************
@@ -202,7 +202,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::BindOnce(&bta_ag_api_result, handle, result, data));

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

}



/*******************************************************************************
@@ -220,22 +220,22 @@ void BTA_AgResult(uint16_t handle, tBTA_AG_RES result, const tBTA_AG_RES_DATA& d 
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::BindOnce(&bta_ag_sm_execute_by_handle, handle,

                                              BTA_AG_API_SETCODEC_EVT, data));

  do_in_main_thread(

          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::BindOnce(&bta_ag_set_sco_offload_enabled, value));

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

}



void BTA_AgSetScoAllowed(bool value) {

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

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

}



void BTA_AgSetActiveDevice(const RawAddress& active_device_addr) {

  if (active_device_addr.IsEmpty()) {

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

    do_in_main_thread(base::BindOnce(&bta_clear_active_device));

  } else {

    do_in_main_thread(FROM_HERE, base::BindOnce(&bta_ag_api_set_active_device, active_device_addr));

    do_in_main_thread(base::BindOnce(&bta_ag_api_set_active_device, active_device_addr));

  }

}

system/bta/ag/bta_ag_rfc.cc

+4 −5
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static void bta_ag_port_cback(uint32_t /* code */, uint16_t port_handle, uint16_ 
      log::error("rfcomm data on an unopened control block {} peer_addr {} state {}", handle,

                 p_scb->peer_addr, bta_ag_state_str(p_scb->state));

    }

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

                                                BTA_AG_RFC_DATA_EVT, tBTA_AG_DATA::kEmpty));

    do_in_main_thread(base::BindOnce(&bta_ag_sm_execute_by_handle, handle, BTA_AG_RFC_DATA_EVT,

                                     tBTA_AG_DATA::kEmpty));

  }

}
@@ -147,7 +147,7 @@ static void bta_ag_mgmt_cback(const tPORT_RESULT code, uint16_t port_handle, uin 


  tBTA_AG_DATA data = {};

  data.rfc.port_handle = port_handle;

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

  do_in_main_thread(base::BindOnce(&bta_ag_sm_execute_by_handle, handle, event, data));

}



/*******************************************************************************
@@ -360,8 +360,7 @@ void bta_ag_rfc_do_close(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& /* data */) { 
    /* Close API was called while AG is in Opening state.               */

    /* Need to trigger the state machine to send callback to the app    */

    /* and move back to INIT state.                                     */

    do_in_main_thread(FROM_HERE,

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

    do_in_main_thread(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

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



  if (handle != 0) {

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

                                                BTA_AG_SCO_OPEN_EVT, tBTA_AG_DATA::kEmpty));

    do_in_main_thread(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 */

    bta_ag_cb.sco.p_curr_scb = nullptr;
@@ -292,8 +292,8 @@ static void bta_ag_sco_disc_cback(uint16_t sco_idx) { 


    bta_ag_cb.sco.p_curr_scb->inuse_codec = tBTA_AG_UUID_CODEC::UUID_CODEC_NONE;



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

                                                BTA_AG_SCO_CLOSE_EVT, tBTA_AG_DATA::kEmpty));

    do_in_main_thread(base::BindOnce(&bta_ag_sm_execute_by_handle, handle, BTA_AG_SCO_CLOSE_EVT,

                                     tBTA_AG_DATA::kEmpty));

  } else {

    /* no match found */

    log::verbose("no scb for ag_sco_disc_cback");
@@ -425,7 +425,7 @@ void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { 
    log::warn("device {} is not active, active_device={}", p_scb->peer_addr, 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::BindOnce(&bta_ag_sm_execute, p_scb, BTA_AG_SCO_CLOSE_EVT,

      do_in_main_thread(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

+1 −2
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ 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::BindOnce(&bta_ag_sm_execute_by_handle, idx, event, disc_result));

    do_in_main_thread(base::BindOnce(&bta_ag_sm_execute_by_handle, idx, event, disc_result));

  }

}

system/bta/dm/bta_dm_act.cc

+5 −5
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ 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::BindOnce(handle_role_change, bd_addr, new_role, hci_status));

  do_in_main_thread(base::BindOnce(handle_role_change, bd_addr, new_role, hci_status));

}



void handle_remote_features_complete(const RawAddress& bd_addr) {
@@ -652,7 +652,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::BindOnce(handle_remote_features_complete, bd_addr));

  do_in_main_thread(base::BindOnce(handle_remote_features_complete, bd_addr));

}



static tBTA_DM_PEER_DEVICE* allocate_device_for(const RawAddress& bd_addr,
@@ -713,7 +713,7 @@ static void bta_dm_acl_up(const RawAddress& bd_addr, tBT_TRANSPORT transport, ui 
}



void BTA_dm_acl_up(const RawAddress bd_addr, tBT_TRANSPORT transport, uint16_t acl_handle) {

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

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

}



static void bta_dm_acl_up_failed(const RawAddress bd_addr, tBT_TRANSPORT transport,
@@ -728,7 +728,7 @@ static void bta_dm_acl_up_failed(const RawAddress bd_addr, tBT_TRANSPORT transpo 
}



void BTA_dm_acl_up_failed(const RawAddress bd_addr, tBT_TRANSPORT transport, tHCI_STATUS status) {

  do_in_main_thread(FROM_HERE, base::BindOnce(bta_dm_acl_up_failed, bd_addr, transport, status));

  do_in_main_thread(base::BindOnce(bta_dm_acl_up_failed, bd_addr, transport, status));

}



static void bta_dm_acl_down(const RawAddress& bd_addr, tBT_TRANSPORT transport) {
@@ -812,7 +812,7 @@ static void bta_dm_acl_down(const RawAddress& bd_addr, tBT_TRANSPORT transport) 
}



void BTA_dm_acl_down(const RawAddress bd_addr, tBT_TRANSPORT transport) {

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

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

}



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