#include "bt-common.h"
#include "bluetooth-telephony-api.h"
-#include "marshal.h"
#include "bt-internal-types.h"
#define BT_SCO_TIMEOUT 3000
} bt_telephony_info_t;
-char *src_addr = NULL;
-
+static char *src_addr = NULL;
+static guint owner_id = 0;
#define BLUETOOTH_TELEPHONY_ERROR (__bluetooth_telephony_error_quark())
#define HFP_AGENT_PATH "/org/bluez/hfp_agent"
#define HFP_AGENT_INTERFACE "Org.Hfp.App.Interface"
-#define TELEPHONY_APP_INTERFACE "org.tizen.csd.Call.Instance"
#define CSD_CALL_APP_PATH "/org/tizen/csd/%d"
#define HFP_NREC_STATUS_CHANGE "NrecStatusChanged"
#define HFP_ANSWER_CALL "Answer"
GVariant *parameters,
gpointer user_data);
-static int __bluetooth_telephony_proxy_init(void);
-static void __bluetooth_telephony_proxy_deinit(void);
static int __bluetooth_telephony_register(void);
static int __bluetooth_telephony_unregister(void);
conn = telephony_dbus_info.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, HFP_AGENT_SERVICE, path, interface, NULL, err);
if (proxy == NULL) {
BT_ERR("Unable to allocate new proxy");
{
BT_DBG("+");
- if (strcasecmp(interface_name, HFP_AGENT_SERVICE) == 0) {
- if (strcasecmp(signal_name, HFP_NREC_STATUS_CHANGE) == 0)
- __bluetooth_handle_nrec_status_change(parameters);
- else if (strcasecmp(signal_name, HFP_ANSWER_CALL) == 0)
- __bluetooth_telephony_answer_call(parameters);
- else if (strcasecmp(signal_name, HFP_REJECT_CALL) == 0)
- __bluetooth_telephony_reject_call(parameters);
- else if (strcasecmp(signal_name, HFP_RELEASE_CALL) == 0)
- __bluetooth_telephony_release_call(parameters);
- else if (strcasecmp(signal_name, HFP_THREEWAY_CALL) == 0)
- __bluetooth_telephony_threeway_call(parameters);
- } else if (strcasecmp(interface_name, BLUEZ_HEADSET_INTERFACE) == 0) {
+ if (strcasecmp(interface_name, BLUEZ_HEADSET_INTERFACE) == 0) {
if (strcasecmp(signal_name, "PropertyChanged") == 0) {
GVariant *values;
gchar *property;
}
g_variant_unref(values);
- }
+ } else if (strcasecmp(signal_name, HFP_NREC_STATUS_CHANGE) == 0)
+ __bluetooth_handle_nrec_status_change(parameters);
+ else if (strcasecmp(signal_name, HFP_ANSWER_CALL) == 0)
+ __bluetooth_telephony_answer_call(parameters);
+ else if (strcasecmp(signal_name, HFP_REJECT_CALL) == 0)
+ __bluetooth_telephony_reject_call(parameters);
+ else if (strcasecmp(signal_name, HFP_RELEASE_CALL) == 0)
+ __bluetooth_telephony_release_call(parameters);
+ else if (strcasecmp(signal_name, HFP_THREEWAY_CALL) == 0)
+ __bluetooth_telephony_threeway_call(parameters);
}
BT_DBG("-");
}
static int __bluetooth_telephony_proxy_init(void)
{
FN_START;
- guint owner_id;
GDBusNodeInfo *node_info;
+ gchar *name;
+
+ name = g_strdup_printf("org.tizen.csd.Call.Instance.p%d", getpid());
+ BT_DBG("well-known name: %s", name);
- owner_id = g_bus_own_name(G_BUS_TYPE_SYSTEM,
- TELEPHONY_APP_INTERFACE,
- G_BUS_NAME_OWNER_FLAGS_NONE,
- NULL, NULL, NULL,
- NULL, NULL);
- BT_DBG("owner_id is [%d]", owner_id);
+ owner_id = g_bus_own_name_on_connection(telephony_dbus_info.conn,
+ name, G_BUS_NAME_OWNER_FLAGS_NONE, NULL, NULL, NULL, NULL);
+ BT_DBG("owner_id: %d", owner_id);
+ g_free(name);
node_info = __bt_telephony_create_method_node_info(
bt_telephony_introspection_xml);
FN_START;
__bluetooth_telephony_register_object(FALSE, NULL);
+ g_bus_unown_name(owner_id);
FN_END;
- return;
}
static int __bluetooth_telephony_register(void)
int ret = BLUETOOTH_TELEPHONY_ERROR_NONE;
FN_START;
- conn = _bt_gdbus_get_system_gconn();
+ conn = _bt_get_system_private_conn();
retv_if(conn == NULL, BLUETOOTH_TELEPHONY_ERROR_INTERNAL);
manager_proxy = g_dbus_proxy_new_sync(
- conn, G_DBUS_PROXY_FLAGS_NONE, NULL,
+ conn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BLUEZ_SERVICE_NAME, "/",
BLUEZ_MANAGER_INTERFACE, NULL, &error);
if (manager_proxy == NULL) {
g_variant_unref(path_values); /* path_values unused*/
proxy = g_dbus_proxy_new_sync(telephony_dbus_info.conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BLUEZ_SERVICE_NAME, object_path,
BLUEZ_PROPERTIES_INTERFACE, NULL, &error);
if (proxy == NULL) {
/* this is headset; Check for Connection */
headset_agent_proxy = g_dbus_proxy_new_sync(telephony_dbus_info.conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
HFP_AGENT_SERVICE, object_path,
HFP_AGENT_INTERFACE, NULL, &error);
if (headset_agent_proxy == NULL) {
return NULL;
proxy = g_dbus_proxy_new_sync(telephony_dbus_info.conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
HFP_AGENT_SERVICE, HFP_AGENT_PATH,
HFP_AGENT_INTERFACE, NULL, &error);
if (proxy == NULL) {
if (conn == NULL)
return -1;
- static guint subscribe_event1_id = 0;
- static guint subscribe_event2_id = 0;
- static guint subscribe_event3_id = 0;
- static guint subscribe_event4_id = 0;
- static guint subscribe_event5_id = 0;
- static guint subscribe_event6_id = 0;
+ static guint event_id = 0;
if (subscribe == TRUE) {
- if (subscribe_event1_id == 0) {
- subscribe_event1_id = g_dbus_connection_signal_subscribe(conn,
+ if (event_id == 0) {
+ event_id = g_dbus_connection_signal_subscribe(conn,
NULL, BLUEZ_HEADSET_INTERFACE,
- "PropertyChanged", NULL, NULL, 0,
- __bluetooth_telephony_event_filter,
- NULL, NULL);
- }
- if (subscribe_event2_id == 0) {
- subscribe_event2_id = g_dbus_connection_signal_subscribe(conn,
- NULL, HFP_AGENT_SERVICE,
- HFP_NREC_STATUS_CHANGE, NULL, NULL, 0,
+ NULL, NULL, NULL, 0,
__bluetooth_telephony_event_filter,
NULL, NULL);
}
-
- if (subscribe_event3_id == 0) {
- subscribe_event3_id = g_dbus_connection_signal_subscribe(conn,
- NULL, HFP_AGENT_SERVICE,
- HFP_ANSWER_CALL, NULL, NULL, 0,
- __bluetooth_telephony_event_filter,
- NULL, NULL);
- }
- if (subscribe_event4_id == 0) {
- subscribe_event4_id = g_dbus_connection_signal_subscribe(conn,
- NULL, HFP_AGENT_SERVICE,
- HFP_REJECT_CALL, NULL, NULL, 0,
- __bluetooth_telephony_event_filter,
- NULL, NULL);
- }
- if (subscribe_event5_id == 0) {
- subscribe_event5_id = g_dbus_connection_signal_subscribe(conn,
- NULL, HFP_AGENT_SERVICE,
- HFP_RELEASE_CALL, NULL, NULL, 0,
- __bluetooth_telephony_event_filter,
- NULL, NULL);
- }
- if (subscribe_event6_id == 0) {
- subscribe_event6_id = g_dbus_connection_signal_subscribe(conn,
- NULL, HFP_AGENT_SERVICE,
- HFP_THREEWAY_CALL, NULL, NULL, 0,
- __bluetooth_telephony_event_filter,
- NULL, NULL);
- }
-
return BLUETOOTH_TELEPHONY_ERROR_NONE;
} else {
- if (subscribe_event1_id > 0) {
- g_dbus_connection_signal_unsubscribe(conn,
- subscribe_event1_id);
- subscribe_event1_id = 0;
- }
- if (subscribe_event2_id > 0) {
- g_dbus_connection_signal_unsubscribe(conn,
- subscribe_event2_id);
- subscribe_event2_id = 0;
- }
- if (subscribe_event3_id > 0) {
- g_dbus_connection_signal_unsubscribe(conn,
- subscribe_event3_id);
- subscribe_event3_id = 0;
- }
- if (subscribe_event4_id > 0) {
- g_dbus_connection_signal_unsubscribe(conn,
- subscribe_event4_id);
- subscribe_event4_id = 0;
- }
- if (subscribe_event5_id > 0) {
- g_dbus_connection_signal_unsubscribe(conn,
- subscribe_event5_id);
- subscribe_event5_id = 0;
- }
- if (subscribe_event6_id > 0) {
+ if (event_id > 0) {
g_dbus_connection_signal_unsubscribe(conn,
- subscribe_event6_id);
- subscribe_event6_id = 0;
+ event_id);
+ event_id = 0;
}
return BLUETOOTH_TELEPHONY_ERROR_NONE;
}
is_initialized = TRUE;
- telephony_dbus_info.conn = _bt_gdbus_init_system_gconn();
+ /* As a result of discussion with system team, private connection is not
+ * suitable in here. It is better to use shared connection. */
+ //telephony_dbus_info.conn = _bt_gdbus_init_system_gconn();
+ telephony_dbus_info.conn = _bt_get_system_shared_conn();
if (!telephony_dbus_info.conn) {
is_initialized = FALSE;
BT_ERR("Could not get DBus Connection");
telephony_dbus_info.manager_proxy = g_dbus_proxy_new_sync(
telephony_dbus_info.conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BLUEZ_SERVICE_NAME, "/",
BLUEZ_MANAGER_INTERFACE, NULL, &error);
if (telephony_dbus_info.manager_proxy == NULL) {
telephony_dbus_info.dbus_proxy = g_dbus_proxy_new_sync(
telephony_dbus_info.conn,
- G_DBUS_PROXY_FLAGS_NONE, NULL,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
BT_EVENT_FREEDESKTOP, BT_FREEDESKTOP_PATH,
BT_EVENT_FREEDESKTOP, NULL, &error);
if (NULL == telephony_dbus_info.dbus_proxy) {
return BLUETOOTH_TELEPHONY_ERROR_PERMISSION_DENIED;
}
- conn = _bt_gdbus_get_system_gconn();
+ conn = _bt_get_system_private_conn();
if (!conn) {
BT_DBG("No System Bus found\n");
return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
if (telephony_info.headset_state == BLUETOOTH_STATE_PLAYING)
return BLUETOOTH_TELEPHONY_ERROR_ALREADY_CONNECTED;
- proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE, NULL,
+ proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
HFP_AGENT_SERVICE, HFP_AGENT_PATH,
HFP_AGENT_INTERFACE, NULL, &err);
if (proxy == NULL) {
return BLUETOOTH_TELEPHONY_ERROR_PERMISSION_DENIED;
}
- conn = _bt_gdbus_get_system_gconn();
+ conn = _bt_get_system_private_conn();
if (!conn) {
BT_DBG("No System Bus found\n");
return BLUETOOTH_TELEPHONY_ERROR_INTERNAL;
if (telephony_info.headset_state != BLUETOOTH_STATE_PLAYING)
return BLUETOOTH_TELEPHONY_ERROR_NOT_CONNECTED;
- proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE, NULL,
+ proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
HFP_AGENT_SERVICE, HFP_AGENT_PATH,
HFP_AGENT_INTERFACE, NULL, &err);
if (proxy == NULL) {
projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff