X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-audio.c;h=1b124147a03d116e122124ca133b77cd5f288425;hb=1fa07edcd0e77a445700975773db3300f556caf5;hp=054c7c5993c8fbbdc0606ca039c58833bc9b74b5;hpb=4865d06dbc606081419c3c1ce3954c4e43b0aab9;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-audio.c b/bt-api/bt-audio.c index 054c7c5..1b12414 100644 --- a/bt-api/bt-audio.c +++ b/bt-api/bt-audio.c @@ -24,11 +24,10 @@ #include "bt-common.h" #include "bt-request-sender.h" #include "bt-event-handler.h" -#ifdef TIZEN_DPM_ENABLE +#ifdef TIZEN_FEATURE_BT_DPM #include "bt-dpm.h" #endif - BT_EXPORT_API int bluetooth_audio_init(bt_audio_func_ptr cb, void *user_data) { int ret; @@ -89,16 +88,16 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add return BLUETOOTH_ERROR_PERMISSION_DEINED; } -#ifdef TIZEN_DPM_ENABLE +#ifdef TIZEN_FEATURE_BT_DPM if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) { BT_ERR("Blacklist device"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } if (_bt_check_dpm(BT_DPM_HSP, NULL) == BT_DPM_RESTRICTED && _bt_check_dpm(BT_DPM_A2DP, NULL) == BT_DPM_RESTRICTED) { BT_ERR("Not allow to use HSP / A2DP profile"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } else if (_bt_check_dpm(BT_DPM_HSP, NULL) == BT_DPM_RESTRICTED) { BT_ERR("Not allow to use HSP profile"); service_function = BT_AV_CONNECT; @@ -116,7 +115,7 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add if (dev_class.major_class == BLUETOOTH_DEVICE_MAJOR_CLASS_COMPUTER) { BT_ERR("Reject a authorization due to MDM Policy"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } } #endif @@ -129,9 +128,20 @@ BT_EXPORT_API int bluetooth_audio_connect(bluetooth_device_address_t *remote_add g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); - result = _bt_send_request_async(BT_BLUEZ_SERVICE, service_function, - in_param1, in_param2, in_param3, in_param4, - user_info->cb, user_info->user_data); +#ifdef TIZEN_FEATURE_BT_DPM + if (service_function == BT_AV_CONNECT) + result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AV_CONNECT, + in_param1, in_param2, in_param3, in_param4, + user_info->cb, user_info->user_data); + else if (service_function == BT_AG_CONNECT) + result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AG_CONNECT, + in_param1, in_param2, in_param3, in_param4, + user_info->cb, user_info->user_data); + else /* default case - with or without DPM enabled */ +#endif + result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AUDIO_CONNECT, + in_param1, in_param2, in_param3, in_param4, + user_info->cb, user_info->user_data); BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -183,15 +193,15 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres return BLUETOOTH_ERROR_PERMISSION_DEINED; } -#ifdef TIZEN_DPM_ENABLE +#ifdef TIZEN_FEATURE_BT_DPM if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) { BT_ERR("Blacklist device"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } if (_bt_check_dpm(BT_DPM_HSP, NULL) == BT_DPM_RESTRICTED) { BT_ERR("Not allow to use HSP profile"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } if (_bt_check_dpm(BT_DPM_DESKTOP, NULL) == BT_DPM_RESTRICTED) { @@ -203,7 +213,7 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres if (dev_class.major_class == BLUETOOTH_DEVICE_MAJOR_CLASS_COMPUTER) { BT_ERR("Reject a authorization due to MDM Policy"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } } #endif @@ -216,6 +226,7 @@ BT_EXPORT_API int bluetooth_ag_connect(bluetooth_device_address_t *remote_addres g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); + BT_INFO_C("### Connect AG"); result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AG_CONNECT, in_param1, in_param2, in_param3, in_param4, user_info->cb, user_info->user_data); @@ -247,6 +258,7 @@ BT_EXPORT_API int bluetooth_ag_disconnect(bluetooth_device_address_t *remote_add g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); + BT_INFO_C("### Disconnect AG"); result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AG_DISCONNECT, in_param1, in_param2, in_param3, in_param4, user_info->cb, user_info->user_data); @@ -270,15 +282,15 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres return BLUETOOTH_ERROR_PERMISSION_DEINED; } -#ifdef TIZEN_DPM_ENABLE +#ifdef TIZEN_FEATURE_BT_DPM if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) { BT_ERR("Blacklist device"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } if (_bt_check_dpm(BT_DPM_A2DP, NULL) == BT_DPM_RESTRICTED) { BT_ERR("Not allow to use A2DP profile"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } if (_bt_check_dpm(BT_DPM_DESKTOP, NULL) == BT_DPM_RESTRICTED) { @@ -290,7 +302,7 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres if (dev_class.major_class == BLUETOOTH_DEVICE_MAJOR_CLASS_COMPUTER) { BT_ERR("Reject a authorization due to MDM Policy"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } } #endif @@ -303,6 +315,7 @@ BT_EXPORT_API int bluetooth_av_connect(bluetooth_device_address_t *remote_addres g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); + BT_INFO_C("### Connect AV"); result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AV_CONNECT, in_param1, in_param2, in_param3, in_param4, user_info->cb, user_info->user_data); @@ -326,15 +339,15 @@ BT_EXPORT_API int bluetooth_av_source_connect(bluetooth_device_address_t *remote return BLUETOOTH_ERROR_PERMISSION_DEINED; } -#ifdef TIZEN_DPM_ENABLE +#ifdef TIZEN_FEATURE_BT_DPM if (_bt_check_dpm(BT_DPM_ADDRESS, (void *)remote_address) == BT_DPM_RESTRICTED) { BT_ERR("Blacklist device"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } if (_bt_check_dpm(BT_DPM_A2DP, NULL) == BT_DPM_RESTRICTED) { BT_ERR("Not allow to use A2DP profile"); - return BLUETOOTH_ERROR_ACCESS_DENIED; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } #endif @@ -346,6 +359,7 @@ BT_EXPORT_API int bluetooth_av_source_connect(bluetooth_device_address_t *remote g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); + BT_INFO_C("### Connect AV Source"); result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AV_SOURCE_CONNECT, in_param1, in_param2, in_param3, in_param4, user_info->cb, user_info->user_data); @@ -377,6 +391,7 @@ BT_EXPORT_API int bluetooth_av_disconnect(bluetooth_device_address_t *remote_add g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); + BT_INFO_C("### Disconnect AV"); result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AV_DISCONNECT, in_param1, in_param2, in_param3, in_param4, user_info->cb, user_info->user_data); @@ -408,6 +423,7 @@ BT_EXPORT_API int bluetooth_av_source_disconnect(bluetooth_device_address_t *rem g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); + BT_INFO_C("### Disconnect AV Source"); result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_AV_SOURCE_DISCONNECT, in_param1, in_param2, in_param3, in_param4, user_info->cb, user_info->user_data); @@ -417,6 +433,24 @@ BT_EXPORT_API int bluetooth_av_source_disconnect(bluetooth_device_address_t *rem return result; } +BT_EXPORT_API int bluetooth_audio_select_role(bluetooth_audio_role_t role) +{ + int result; + + BT_CHECK_ENABLED(return); + + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + g_array_append_vals(in_param1, &role, sizeof(bluetooth_audio_role_t)); + + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AUDIO_SELECT_ROLE, + in_param1, in_param2, in_param3, in_param4, &out_param); + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + return result; +} + BT_EXPORT_API int bluetooth_ag_get_headset_volume(unsigned int *speaker_gain) { int result; @@ -446,10 +480,10 @@ BT_EXPORT_API int bluetooth_ag_set_speaker_gain(unsigned int speaker_gain) BT_CHECK_ENABLED(return); -#ifdef TIZEN_DPM_ENABLE +#ifdef TIZEN_FEATURE_BT_DPM if (_bt_check_dpm(BT_DPM_HSP, NULL) == BT_DPM_RESTRICTED) { BT_ERR("Not allow to use HSP profile"); - return BLUETOOTH_ERROR_ACCESS_DENIED;; + return BLUETOOTH_ERROR_DEVICE_POLICY_RESTRICTION; } #endif @@ -478,10 +512,10 @@ static GVariant* __bt_hf_agent_dbus_send(const char *path, const char *interface GDBusProxy *proxy = NULL; GDBusConnection *conn = NULL; - conn = _bt_gdbus_get_system_gconn(); + conn = _bt_get_system_private_conn(); retv_if(conn == NULL, NULL); - proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE, + proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL, BT_HF_SERVICE_NAME, path, interface, NULL, err); if (proxy == NULL) { BT_ERR("Unable to allocate new proxy"); @@ -508,30 +542,24 @@ static int __bt_hf_agent_read_call_list(GVariant *reply, g_variant_get(reply, "(i@a(siiii))", &call_count, &var_temp); - if(call_count <= 0) { + if (call_count <= 0) { *call_list = NULL; return BLUETOOTH_ERROR_NOT_FOUND; } BT_DBG("Call count = %d", call_count); *call_list = g_malloc0(sizeof(bt_hf_call_list_s)); - /* Fix : NULL_RETURNS */ - retv_if(*call_list == NULL, BLUETOOTH_ERROR_MEMORY_ALLOCATION); - (*call_list)->count = call_count; g_variant_iter_init(&iter, var_temp); - while(g_variant_iter_loop(&iter, "(siiii)", &num, &dir, &status, &mpart, &idx)){ + while (g_variant_iter_loop(&iter, "(siiii)", &num, &dir, &status, &mpart, &idx)) { bt_hf_call_status_info_t *call_info; call_info = g_malloc0(sizeof(bt_hf_call_status_info_t)); - /* Fix : NULL_RETURNS */ - retv_if(call_info == NULL, BLUETOOTH_ERROR_MEMORY_ALLOCATION); - call_info->number = g_strdup(num); call_info->direction = dir; call_info->status = status; - call_info->mpart= mpart; + call_info->mpart = mpart; call_info->idx = idx; (*call_list)->list = g_list_append((*call_list)->list, @@ -541,6 +569,21 @@ static int __bt_hf_agent_read_call_list(GVariant *reply, return BLUETOOTH_ERROR_NONE; } +static int __bluetooth_hf_get_error(const char *error_message) +{ + if (error_message == NULL) { + BT_ERR("Error message NULL"); + return BLUETOOTH_ERROR_INTERNAL; + } + + BT_ERR("Error message = %s", error_message); + + if (g_strcmp0(error_message, "NotConnected") == 0) + return BLUETOOTH_ERROR_NOT_CONNECTED; + else + return BLUETOOTH_ERROR_INTERNAL; +} + BT_EXPORT_API int bluetooth_hf_init(bt_hf_func_ptr cb, void *user_data) { int ret; @@ -576,7 +619,7 @@ BT_EXPORT_API int bluetooth_hf_deinit(void) int ret; ret = _bt_unregister_event(BT_HF_AGENT_EVENT); - if (ret != BLUETOOTH_ERROR_NONE ) + if (ret != BLUETOOTH_ERROR_NONE) BT_ERR("_bt_unregister_event failed"); _bt_set_user_data(BT_HF, NULL, NULL); @@ -606,6 +649,7 @@ BT_EXPORT_API int bluetooth_hf_connect(bluetooth_device_address_t *remote_addres g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); + BT_INFO_C("### Connect HF"); result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_HF_CONNECT, in_param1, in_param2, in_param3, in_param4, user_info->cb, user_info->user_data); @@ -637,6 +681,7 @@ BT_EXPORT_API int bluetooth_hf_disconnect(bluetooth_device_address_t *remote_add g_array_append_vals(in_param1, remote_address, sizeof(bluetooth_device_address_t)); + BT_INFO_C("### Disconnect HF"); result = _bt_send_request_async(BT_BLUEZ_SERVICE, BT_HF_DISCONNECT, in_param1, in_param2, in_param3, in_param4, user_info->cb, user_info->user_data); @@ -661,12 +706,7 @@ BT_EXPORT_API int bluetooth_hf_answer_call() if (err) { BT_ERR("Error = %s", err->message); g_dbus_error_strip_remote_error(err); - if (strcmp(err->message, "Operation not supported") == 0) - ret = BLUETOOTH_ERROR_NOT_IN_OPERATION; - else if (strcmp(err->message, "Operation not allowed") == 0) - ret = BLUETOOTH_ERROR_PERMISSION_DEINED; - else - ret = BLUETOOTH_ERROR_INTERNAL; + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } return ret; @@ -681,6 +721,7 @@ BT_EXPORT_API int bluetooth_hf_terminate_call() { GVariant *reply = NULL; GError *err = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -690,9 +731,11 @@ BT_EXPORT_API int bluetooth_hf_terminate_call() BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -719,12 +762,7 @@ BT_EXPORT_API int bluetooth_hf_initiate_call(char *number) if (err) { BT_ERR("Error = %s", err->message); g_dbus_error_strip_remote_error(err); - if (strcmp(err->message, "NotConnected") == 0) - ret = BLUETOOTH_ERROR_NOT_CONNECTED; - else if (strcmp(err->message, "Operation not allowed") == 0) - ret = BLUETOOTH_ERROR_IN_PROGRESS; - else - ret = BLUETOOTH_ERROR_INTERNAL; + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } return ret; @@ -739,6 +777,7 @@ BT_EXPORT_API int bluetooth_hf_voice_recognition(unsigned int status) GVariant *reply = NULL; GError *err = NULL; GVariant *param = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -749,9 +788,11 @@ BT_EXPORT_API int bluetooth_hf_voice_recognition(unsigned int status) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -762,6 +803,7 @@ BT_EXPORT_API int bluetooth_hf_audio_disconnect(void) { GVariant *reply = NULL; GError *err = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -771,9 +813,11 @@ BT_EXPORT_API int bluetooth_hf_audio_disconnect(void) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -785,6 +829,7 @@ BT_EXPORT_API int bluetooth_hf_set_speaker_gain(unsigned int speaker_gain) GVariant *reply = NULL; GError *err = NULL; GVariant *param = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -795,9 +840,11 @@ BT_EXPORT_API int bluetooth_hf_set_speaker_gain(unsigned int speaker_gain) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -809,6 +856,7 @@ BT_EXPORT_API int bluetooth_hf_send_dtmf(char *dtmf) GVariant *reply = NULL; GError *err = NULL; GVariant *param = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -819,9 +867,11 @@ BT_EXPORT_API int bluetooth_hf_send_dtmf(char *dtmf) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -835,11 +885,13 @@ BT_EXPORT_API int bluetooth_hf_send_xsat_cmd(int app_id, char *xsat_cmd) GVariant *param = NULL; char buffer[200] = {0,}; char *ptr = buffer; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); - strncpy(buffer, "AT+XSAT=", strlen("AT+XSAT=")); - snprintf(buffer + strlen(buffer), sizeof(buffer), "%d,", app_id); + strncpy(buffer, "AT+XSAT=\0", 200); + snprintf(buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), + "%d,", app_id); strncat(buffer, xsat_cmd, (sizeof(buffer) - 1) - strlen(buffer)); BT_DBG("Xsat cmd received = %s", buffer); @@ -851,9 +903,11 @@ BT_EXPORT_API int bluetooth_hf_send_xsat_cmd(int app_id, char *xsat_cmd) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -864,6 +918,7 @@ BT_EXPORT_API int bluetooth_hf_release_and_accept(void) { GVariant *reply = NULL; GError *err = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -873,9 +928,11 @@ BT_EXPORT_API int bluetooth_hf_release_and_accept(void) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -886,6 +943,7 @@ BT_EXPORT_API int bluetooth_hf_swap_call(void) { GVariant *reply = NULL; GError *err = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -895,9 +953,11 @@ BT_EXPORT_API int bluetooth_hf_swap_call(void) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -908,6 +968,7 @@ BT_EXPORT_API int bluetooth_hf_release_all_call(void) { GVariant *reply = NULL; GError *err = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -917,9 +978,11 @@ BT_EXPORT_API int bluetooth_hf_release_all_call(void) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -930,6 +993,7 @@ BT_EXPORT_API int bluetooth_hf_join_call(void) { GVariant *reply = NULL; GError *err = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; BT_CHECK_ENABLED(return); @@ -939,9 +1003,11 @@ BT_EXPORT_API int bluetooth_hf_join_call(void) BT_ERR("Error returned in method call\n"); if (err) { BT_ERR("Error = %s", err->message); + g_dbus_error_strip_remote_error(err); + ret = _bt_get_error_value_from_message(err->message); g_clear_error(&err); } - return BLUETOOTH_ERROR_INTERNAL; + return ret; } g_variant_unref(reply); @@ -1023,6 +1089,33 @@ BT_EXPORT_API int bluetooth_hf_request_call_list( return BLUETOOTH_ERROR_NONE; } +BT_EXPORT_API int bluetooth_hf_request_call_list_async(void) +{ + GVariant *reply = NULL; + GError *err = NULL; + int ret = BLUETOOTH_ERROR_INTERNAL; + + BT_CHECK_ENABLED(return); + + reply = __bt_hf_agent_dbus_send(BT_HF_OBJECT_PATH, BT_HF_INTERFACE, + "RequestCallListAsync", &err, NULL); + if (!reply) { + BT_ERR("Error returned in method call\n"); + if (err) { + BT_ERR("Error = %s", err->message); + if (strstr(err->message, "No data")) + ret = BLUETOOTH_ERROR_NO_DATA; + else if (strstr(err->message, "NotConnected")) + ret = BLUETOOTH_ERROR_NOT_CONNECTED; + g_clear_error(&err); + } + return ret; + } + + g_variant_unref(reply); + return BLUETOOTH_ERROR_NONE; +} + BT_EXPORT_API int bluetooth_hf_get_codec(unsigned int *codec_id) { GVariant *reply = NULL; @@ -1072,11 +1165,10 @@ BT_EXPORT_API int bluetooth_hf_get_audio_connected(unsigned int *audio_connected g_variant_get(reply, "(i)", &sco_audio_connected_from_bt_agent); *audio_connected = sco_audio_connected_from_bt_agent; - if (*audio_connected == BLUETOOTH_HF_AUDIO_CONNECTED) { + if (*audio_connected == BLUETOOTH_HF_AUDIO_CONNECTED) BT_DBG("SCO Audio is Connected"); - } else { + else BT_DBG("SCO Audio is Disconnected"); - } g_variant_unref(reply); return BLUETOOTH_ERROR_NONE; @@ -1104,9 +1196,39 @@ BT_EXPORT_API int bluetooth_hf_is_connected(gboolean *hf_connected) g_variant_get(reply, "(b)", &hf_connected_from_bt_agent); *hf_connected = hf_connected_from_bt_agent; - BT_DBG("%s", *hf_connected ? "Connected":"Disconnected"); + BT_DBG("%s", *hf_connected ? "Connected" : "Disconnected"); g_variant_unref(reply); return BLUETOOTH_ERROR_NONE; } +BT_EXPORT_API int bluetooth_hf_is_ibr_supported(gboolean *ibr_supported) +{ + GVariant *reply = NULL; + GError *err = NULL; + gboolean is_supported; + int ret = BLUETOOTH_ERROR_NONE; + + BT_CHECK_ENABLED(return); + + reply = __bt_hf_agent_dbus_send(BT_HF_OBJECT_PATH, BT_HF_INTERFACE, + "IsInbandRingtoneSupported", &err, NULL); + if (!reply) { + BT_ERR("Error returned in method call"); + if (err) { + g_dbus_error_strip_remote_error(err); + ret = __bluetooth_hf_get_error(err->message); + g_error_free(err); + return ret; + } + return BLUETOOTH_ERROR_INTERNAL; + } + + g_variant_get(reply, "(b)", &is_supported); + *ibr_supported = is_supported; + + BT_DBG("%s", *ibr_supported ? "Supported" : "Not Supported"); + + g_variant_unref(reply); + return ret; +}