Merge "mesh: update interface registration return statements" into tizen

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

diff --git a/bt-api/bt-telephony.c b/bt-api/bt-telephony.c
index 4c50132..498a422 100644 (file)
--- a/bt-api/bt-telephony.c
+++ b/bt-api/bt-telephony.c
@@ -944,7 +944,7 @@ static int __bluetooth_telephony_get_connected_device(void)
        int ret = BLUETOOTH_TELEPHONY_ERROR_NONE;
 
        FN_START;
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        retv_if(conn == NULL, BLUETOOTH_TELEPHONY_ERROR_INTERNAL);
 
        manager_proxy = g_dbus_proxy_new_sync(
@@ -1705,7 +1705,7 @@ BT_EXPORT_API int bluetooth_telephony_audio_open(void)
                return BLUETOOTH_TELEPHONY_ERROR_PERMISSION_DENIED;
        }
 
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        if (!conn) {
                BT_DBG("No System Bus found\n");
                return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
@@ -1778,7 +1778,7 @@ BT_EXPORT_API int bluetooth_telephony_audio_close(void)
                return BLUETOOTH_TELEPHONY_ERROR_PERMISSION_DENIED;
        }
 
-       conn = _bt_get_system_private_conn();
+       conn = _bt_get_system_common_conn();
        if (!conn) {
                BT_DBG("No System Bus found\n");
                return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
@@ -2265,7 +2265,6 @@ BT_EXPORT_API int bluetooth_telephony_is_connected(gboolean *ag_connected)
 
 BT_EXPORT_API int bluetooth_telephony_set_active_headset(const char *remote_addr)
 {
-#ifdef TIZEN_BT_DUAL_HEADSET_CONNECT
        GVariant *reply;
        GVariant *param;
        GError *err = NULL;
@@ -2294,9 +2293,6 @@ BT_EXPORT_API int bluetooth_telephony_set_active_headset(const char *remote_addr
 
        g_variant_unref(reply);
        return BLUETOOTH_TELEPHONY_ERROR_NONE;
-#else
-       return BLUETOOTH_ERROR_NOT_SUPPORT;
-#endif
 }
 
 static void __bt_telephony_adapter_filter(GDBusConnection *connection,