Remove unnecessary connection getting functions

[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 33a0df2..d569f87 100644 (file)
--- a/bt-api/bt-audio.c
+++ b/bt-api/bt-audio.c
@@ -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);
 
@@ -417,6 +428,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;
@@ -478,10 +507,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");
@@ -671,12 +700,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;
@@ -691,6 +715,7 @@ BT_EXPORT_API int bluetooth_hf_terminate_call()
 {
        GVariant *reply = NULL;
        GError *err = NULL;
+       int ret = BLUETOOTH_ERROR_INTERNAL;
 
        BT_CHECK_ENABLED(return);
 
@@ -700,9 +725,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);
@@ -729,12 +756,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;
@@ -749,6 +771,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);
 
@@ -759,9 +782,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);
@@ -772,6 +797,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);
 
@@ -781,9 +807,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);
@@ -795,6 +823,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);
 
@@ -805,9 +834,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);
@@ -819,6 +850,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);
 
@@ -829,9 +861,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);
@@ -845,6 +879,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);
 
@@ -862,9 +897,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);
@@ -875,6 +912,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);
 
@@ -884,9 +922,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);
@@ -897,6 +937,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);
 
@@ -906,9 +947,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);
@@ -919,6 +962,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);
 
@@ -928,9 +972,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);
@@ -941,6 +987,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);
 
@@ -950,9 +997,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);
@@ -1034,6 +1083,31 @@ 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;
+                       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;