From 6c1a1eafeb2f732c966e9c0abd83d8ddf6ecba66 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Fri, 19 Dec 2014 09:40:20 +0100 Subject: [PATCH] android/ipc-tester: Fix using invalid service id Some handsfree client tests were using bluetooth service id. This is due to copy-and-paste error. --- android/ipc-tester.c | 48 ++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/android/ipc-tester.c b/android/ipc-tester.c index c2013f7e0..9b6c8bbd3 100644 --- a/android/ipc-tester.c +++ b/android/ipc-tester.c @@ -1355,32 +1355,38 @@ int main(int argc, char *argv[]) sizeof(struct hal_cmd_hf_client_disconnect_audio), -1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Start VR+", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Start VR+", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_START_VR, 0, 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Start VR-", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Start VR-", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_START_VR, 0, -1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Stop VR+", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Stop VR+", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_STOP_VR, 0, 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Stop VR-", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Stop VR-", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_STOP_VR, 0, -1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Vol Contr.+", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Vol Contr.+", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_VOLUME_CONTROL, sizeof(struct hal_cmd_hf_client_volume_control), 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Vol Contr.-", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Vol Contr.-", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_VOLUME_CONTROL, sizeof(struct hal_cmd_hf_client_volume_control), -1, HAL_SERVICE_ID_BLUETOOTH, @@ -1401,22 +1407,26 @@ int main(int argc, char *argv[]) sizeof(hfp_number)), HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Dial Memory+", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Dial Memory+", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_DIAL_MEMORY, sizeof(struct hal_cmd_hf_client_dial_memory), 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Dial Memory-", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Dial Memory-", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_DIAL_MEMORY, sizeof(struct hal_cmd_hf_client_dial_memory), -1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Call Action+", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Call Action+", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_CALL_ACTION, sizeof(struct hal_cmd_hf_client_call_action), 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); - test_datasize_valid("HF_CLIENT Call Action-", HAL_SERVICE_ID_BLUETOOTH, + test_datasize_valid("HF_CLIENT Call Action-", + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_CALL_ACTION, sizeof(struct hal_cmd_hf_client_call_action), -1, HAL_SERVICE_ID_BLUETOOTH, @@ -1428,55 +1438,55 @@ int main(int argc, char *argv[]) HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Query Current Calls-", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_QUERY_CURRENT_CALLS, 0, -1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Query Operator Name+", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_QUERY_OPERATOR_NAME, 0, 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Query Operator Name-", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_QUERY_OPERATOR_NAME, 0, -1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Retrieve Subscrb. Info+", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_RETRIEVE_SUBSCR_INFO, 0, 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Retrieve Subscrb. Info-", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_RETRIEVE_SUBSCR_INFO, 0, -1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Send DTMF+", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_SEND_DTMF, sizeof(struct hal_cmd_hf_client_send_dtmf), 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Send DTMF-", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_SEND_DTMF, sizeof(struct hal_cmd_hf_client_send_dtmf), -1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Get Last Voice Tag+", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_GET_LAST_VOICE_TAG_NUM, 0, 1, HAL_SERVICE_ID_BLUETOOTH, HAL_SERVICE_ID_HANDSFREE_CLIENT); test_datasize_valid("HF_CLIENT Get Last Voice Tag-", - HAL_SERVICE_ID_BLUETOOTH, + HAL_SERVICE_ID_HANDSFREE_CLIENT, HAL_OP_HF_CLIENT_GET_LAST_VOICE_TAG_NUM, 0, -1, HAL_SERVICE_ID_BLUETOOTH, -- 2.47.3