Enhance debug message

[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 1bd297e..1b12414 100644 (file)
--- a/bt-api/bt-audio.c
+++ b/bt-api/bt-audio.c
@@ -24,7 +24,7 @@
 #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
 
@@ -88,7 +88,7 @@ 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_DEVICE_POLICY_RESTRICTION;
@@ -128,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);
 
@@ -182,7 +193,7 @@ 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_DEVICE_POLICY_RESTRICTION;
@@ -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,7 +282,7 @@ 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_DEVICE_POLICY_RESTRICTION;
@@ -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,7 +339,7 @@ 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_DEVICE_POLICY_RESTRICTION;
@@ -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,7 +480,7 @@ 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_DEVICE_POLICY_RESTRICTION;
@@ -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");
@@ -515,9 +549,6 @@ static int __bt_hf_agent_read_call_list(GVariant *reply,
        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);
@@ -525,9 +556,6 @@ static int __bt_hf_agent_read_call_list(GVariant *reply,
                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;
@@ -653,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);
@@ -677,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;
@@ -697,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);
 
@@ -706,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);
@@ -735,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;
@@ -755,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);
 
@@ -765,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);
@@ -778,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);
 
@@ -787,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);
@@ -801,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);
 
@@ -811,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);
@@ -825,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);
 
@@ -835,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);
@@ -851,6 +885,7 @@ 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);
 
@@ -868,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);
@@ -881,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);
 
@@ -890,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);
@@ -903,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);
 
@@ -912,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);
@@ -925,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);
 
@@ -934,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);
@@ -947,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);
 
@@ -956,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);
@@ -1040,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;
@@ -1089,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;
@@ -1152,7 +1227,7 @@ BT_EXPORT_API int bluetooth_hf_is_ibr_supported(gboolean *ibr_supported)
        g_variant_get(reply, "(b)", &is_supported);
        *ibr_supported = is_supported;
 
-       BT_DBG("%s", *ibr_supported ? "Supported":"Not Supported");
+       BT_DBG("%s", *ibr_supported ? "Supported" : "Not Supported");
 
        g_variant_unref(reply);
        return ret;