Fix bt-service crash on Fhub TCT

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-audio.c

diff --git a/bt-api/bt-audio.c b/bt-api/bt-audio.c
index e890624..eb1523d 100644 (file)
--- a/bt-api/bt-audio.c
+++ b/bt-api/bt-audio.c
@@ -258,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);
@@ -314,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);
@@ -357,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);
@@ -388,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);
@@ -419,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);
@@ -446,6 +451,75 @@ BT_EXPORT_API int bluetooth_audio_select_role(bluetooth_audio_role_t role)
        return result;
 }
 
+BT_EXPORT_API int bluetooth_audio_set_absolute_volume(unsigned int volume)
+{
+       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, &volume, sizeof(unsigned int));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AUDIO_SET_ABSOLUTE_VOLUME,
+               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_audio_get_absolute_volume(unsigned int *volume)
+{
+       int result;
+
+       BT_CHECK_PARAMETER(volume, return);
+       BT_CHECK_ENABLED(return);
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AUDIO_GET_ABSOLUTE_VOLUME,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result == BLUETOOTH_ERROR_NONE) {
+               *volume = g_array_index(out_param,
+                               unsigned int, 0);
+       }
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_audio_is_avc_activated(bool *activated)
+{
+       int result;
+
+       BT_CHECK_PARAMETER(activated, return);
+
+       if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) {
+               BT_DBG("BT is not enabled. So activated value is false");
+               *activated = false;
+               return BLUETOOTH_ERROR_NONE;
+       }
+
+       BT_INIT_PARAMS();
+       BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_AUDIO_IS_AVC_ACTIVATED,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result == BLUETOOTH_ERROR_NONE) {
+               *activated = g_array_index(out_param,
+                               bool, 0);
+       }
+
+       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;
@@ -507,7 +581,7 @@ 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_DO_NOT_LOAD_PROPERTIES,
@@ -560,6 +634,8 @@ static int __bt_hf_agent_read_call_list(GVariant *reply,
                (*call_list)->list = g_list_append((*call_list)->list,
                                                        (gpointer)call_info);
        }
+
+       g_variant_unref(var_temp);
        BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
@@ -676,6 +752,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);
@@ -1099,6 +1176,8 @@ BT_EXPORT_API int bluetooth_hf_request_call_list_async(void)
                        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;