summaryrefslogtreecommitdiff
path: root/system/test
diff options
context:
space:
mode:
author Henri Chataing <henrichataing@google.com> 2025-02-24 18:53:40 -0800
committer Henri Chataing <henrichataing@google.com> 2025-02-25 17:32:17 +0000
commit43575e0877dfa260aca41b43bee795b7f00fb161 (patch)
tree1d7c11d8027d45eb20ebb9a50cdb18631e971d91 /system/test
parent51a2e259c84c40100bd26d8d2e4732a02b099a92 (diff)
system/common: Remove location parameter from MessageLoopThread
This change was already applied to do_in_jni_thread and do_in_main_thread. Removing the parameter from MessageLoopThread will bring the API closed to os::Handler. Bug: 331817295 Test: m com.android.bt Flag: EXEMPT, no logical change Change-Id: Iaadaf638de318acba695a49ebe51b69edbd12e0b
Diffstat (limited to 'system/test')
-rw-r--r--system/test/common/main_handler.cc4
-rw-r--r--system/test/mock/mock_jni_thread.cc5
-rw-r--r--system/test/mock/mock_stack_btu_hcif.cc5
3 files changed, 4 insertions, 10 deletions
diff --git a/system/test/common/main_handler.cc b/system/test/common/main_handler.cc
index c6e792c4dc..87e97d9c49 100644
--- a/system/test/common/main_handler.cc
+++ b/system/test/common/main_handler.cc
@@ -42,13 +42,13 @@ void do_post_on_bt_main(BtMainClosure closure) { closure(); }
} // namespace
bt_status_t do_in_main_thread(base::OnceClosure task) {
- bluetooth::log::assert_that(main_thread.DoInThread(FROM_HERE, std::move(task)),
+ bluetooth::log::assert_that(main_thread.DoInThread(std::move(task)),
"Unable to run on main thread");
return BT_STATUS_SUCCESS;
}
bt_status_t do_in_main_thread_delayed(base::OnceClosure task, std::chrono::microseconds delay) {
- bluetooth::log::assert_that(!main_thread.DoInThreadDelayed(FROM_HERE, std::move(task), delay),
+ bluetooth::log::assert_that(!main_thread.DoInThreadDelayed(std::move(task), delay),
"Unable to run on main thread delayed");
return BT_STATUS_SUCCESS;
}
diff --git a/system/test/mock/mock_jni_thread.cc b/system/test/mock/mock_jni_thread.cc
index eb8b6db093..2a9365b748 100644
--- a/system/test/mock/mock_jni_thread.cc
+++ b/system/test/mock/mock_jni_thread.cc
@@ -46,8 +46,3 @@ bt_status_t do_in_jni_thread(base::OnceClosure task) {
do_in_jni_thread_task_queue.push(std::move(task));
return BT_STATUS_SUCCESS;
}
-bt_status_t do_in_jni_thread(const base::Location& /* from_here */, base::OnceClosure task) {
- inc_func_call_count(__func__);
- do_in_jni_thread_task_queue.push(std::move(task));
- return BT_STATUS_SUCCESS;
-}
diff --git a/system/test/mock/mock_stack_btu_hcif.cc b/system/test/mock/mock_stack_btu_hcif.cc
index 0a4da4bc03..1d27c8a0b7 100644
--- a/system/test/mock/mock_stack_btu_hcif.cc
+++ b/system/test/mock/mock_stack_btu_hcif.cc
@@ -34,9 +34,8 @@ using hci_cmd_cb = base::OnceCallback<void(uint8_t* /* return_parameters */,
void btu_hcif_send_cmd(uint8_t /* controller_id */, const BT_HDR* /* p_buf */) {
inc_func_call_count(__func__);
}
-void btu_hcif_send_cmd_with_cb(const base::Location& /* posted_from */, uint16_t /* opcode */,
- uint8_t* /* params */, uint8_t /* params_len */,
- hci_cmd_cb /* cb */) {
+void btu_hcif_send_cmd_with_cb(uint16_t /* opcode */, uint8_t* /* params */,
+ uint8_t /* params_len */, hci_cmd_cb /* cb */) {
inc_func_call_count(__func__);
}
void btu_hci_msg_process(BT_HDR* /* p_msg */) { inc_func_call_count(__func__); }