#define BT_SERVICE_NAME "org.projectx.bt"
#define BT_SERVICE_PATH "/org/projectx/bt_service"
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
#define BT_HPS_SERVICE_NAME "org.projectx.httpproxy"
#define BT_HPS_OBJECT_PATH "/org/projectx/httpproxy"
#define BT_HPS_INTERFACE_NAME "org.projectx.httpproxy_service"
static GDBusConnection *service_gconn;
static GDBusProxy *service_gproxy;
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
static GDBusProxy *hps_gproxy;
#endif
+static gboolean factory_test_mode;
void _bt_core_fill_garray_from_variant(GVariant *var, GArray *param)
{
return (service_gproxy) ? service_gproxy : __bt_core_gdbus_init_service_proxy();
}
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
int _bt_core_start_httpproxy(void)
{
GVariant *variant = NULL;
unsigned char enabled;
-
+ GError *err = NULL;
BT_DBG(" ");
hps_gproxy = _bt_core_gdbus_get_hps_proxy();
}
variant = g_dbus_proxy_call_sync(hps_gproxy, "enable",
- NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) {
+ BT_ERR("Error : %s" , err->message);
+ g_clear_error(&err);
+ }
if (variant) {
g_variant_get(variant, "(y)", &enabled);
BT_ERR("HPS enabled status 0x%x", enabled);
{
GVariant *variant = NULL;
unsigned char enabled;
-
+ GError *err = NULL;
BT_DBG(" ");
hps_gproxy = _bt_core_gdbus_get_hps_proxy();
}
variant = g_dbus_proxy_call_sync(hps_gproxy, "disable",
- NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) {
+ BT_ERR("Error : %s" , err->message);
+ g_clear_error(&err);
+ }
if (variant) {
g_variant_get(variant, "(y)", &enabled);
BT_ERR("HPS disabled status 0x%x", enabled);
service_gproxy = NULL;
}
-#ifdef HPS_FEATURE
+#ifdef TIZEN_FEATURE_BT_HPS
if (hps_gproxy) {
g_object_unref(hps_gproxy);
hps_gproxy = NULL;
GArray **out_param1)
{
GDBusProxy *proxy;
- GVariant *ret;
+ GVariant *ret = NULL;
GVariant *param1;
GVariant *param2;
GVariant *param3;
GError *error = NULL;
GArray *in_param5 = NULL;
- int retry = 5;
-
proxy = _bt_core_gdbus_get_service_proxy();
if (!proxy)
return BLUETOOTH_ERROR_INTERNAL;
in_param5 = g_array_new(TRUE, TRUE, sizeof(gchar));
- while (--retry >= 0) {
- param1 = g_variant_new_from_data((const GVariantType *)"ay",
- in_param1->data, in_param1->len,
- TRUE, NULL, NULL);
- param2 = g_variant_new_from_data((const GVariantType *)"ay",
- in_param2->data, in_param2->len,
- TRUE, NULL, NULL);
- param3 = g_variant_new_from_data((const GVariantType *)"ay",
- in_param3->data, in_param3->len,
- TRUE, NULL, NULL);
- param4 = g_variant_new_from_data((const GVariantType *)"ay",
- in_param4->data, in_param4->len,
- TRUE, NULL, NULL);
- param5 = g_variant_new_from_data((const GVariantType *)"ay",
- in_param5->data, in_param5->len,
- TRUE, NULL, NULL);
-
- ret = g_dbus_proxy_call_sync(proxy, "service_request",
- g_variant_new("(iii@ay@ay@ay@ay@ay)",
- service_type, service_function,
- BT_SYNC_REQ, param1,
- param2, param3,
- param4, param5),
- G_DBUS_CALL_FLAGS_NONE, 2000,
- NULL, &error);
- if (ret == NULL && error != NULL) {
- if (error->code == G_IO_ERROR_TIMED_OUT) {
- BT_ERR("D-Bus Timed out.");
- g_clear_error(&error);
- continue;
- }
- }
-
- break;
- }
-
+ param1 = g_variant_new_from_data((const GVariantType *)"ay",
+ in_param1->data, in_param1->len,
+ TRUE, NULL, NULL);
+ param2 = g_variant_new_from_data((const GVariantType *)"ay",
+ in_param2->data, in_param2->len,
+ TRUE, NULL, NULL);
+ param3 = g_variant_new_from_data((const GVariantType *)"ay",
+ in_param3->data, in_param3->len,
+ TRUE, NULL, NULL);
+ param4 = g_variant_new_from_data((const GVariantType *)"ay",
+ in_param4->data, in_param4->len,
+ TRUE, NULL, NULL);
+ param5 = g_variant_new_from_data((const GVariantType *)"ay",
+ in_param5->data, in_param5->len,
+ TRUE, NULL, NULL);
+
+ ret = g_dbus_proxy_call_sync(proxy, "service_request",
+ g_variant_new("(iii@ay@ay@ay@ay@ay)",
+ service_type, service_function,
+ BT_SYNC_REQ, param1,
+ param2, param3,
+ param4, param5),
+ G_DBUS_CALL_FLAGS_NONE, 10000,
+ NULL, &error);
g_array_free(in_param5, TRUE);
if (ret == NULL) {
" </method>"
" <method name='EnableCore'>"
" </method>"
+" <method name='SetTransferValue'>"
+" <arg type='b' name='value' direction='in'/>"
+" </method>"
" <method name='FactoryTestMode'>"
" <arg type='s' name='type' direction='in'/>"
" <arg type='s' name='arg' direction='in'/>"
ret = _bt_core_disable_adapter_le();
} else if (g_strcmp0(method_name, "EnableCore") == 0) {
ret = _bt_core_enable_core();
+ } else if (g_strcmp0(method_name, "SetTransferValue") == 0) {
+ gboolean value = FALSE;
+
+ g_variant_get(parameters, "(b)", &value);
+ BT_DBG("Transfer value: %d", value);
+
+ ret = _bt_core_set_transfer_value(value);
} else if (g_strcmp0(method_name, "FactoryTestMode") == 0) {
const char *type = NULL;
const char *arg = NULL;
g_variant_get(parameters, "(&s&s)", &type, &arg);
ret = _bt_core_factory_test_mode(type, arg);
- g_dbus_method_invocation_return_value(invocation,
+ factory_test_mode = TRUE;
+
+ if (ret == TRUE)
+ g_dbus_method_invocation_return_value(invocation,
g_variant_new("(i)", ret));
+ else
+ _bt_core_terminate();
+
return;
} else {
ret = FALSE;
{
gboolean flight_mode_status;
- BT_DBG("");
-
flight_mode_status = _bt_core_is_flight_mode_enabled();
if (flight_mode_status == FALSE && _bt_is_flightmode_request() == TRUE) {
if ((g_strcmp0(name, "org.bluez") == 0) ||
(g_strcmp0(name, "org.projectx.bt") == 0)) {
- BT_DBG("%s is terminated", name);
- if (_bt_check_terminating_condition() == TRUE) {
+ BT_INFO("%s is terminated", name);
+ if (_bt_check_terminating_condition() == TRUE && factory_test_mode == FALSE) {
_bt_disable_adapter();
_bt_disable_adapter_le();
_bt_core_terminate();
g_variant_get(parameters, "(&o@a{sa{sv}})",
&obj_path, &optional_param);
- if (g_strcmp0(obj_path, "/org/bluez/hci0") == 0) {
+ if (g_strcmp0(obj_path, "/org/bluez/hci0") == 0)
_bt_core_adapter_added_cb();
- }
+
} else if (!g_strcmp0(signal_name, "InterfacesRemoved")) {
char *obj_path = NULL;
GVariant *optional_param;
g_variant_get(parameters, "(&o@as)", &obj_path,
&optional_param);
- if (g_strcmp0(obj_path, "/org/bluez/hci0") == 0) {
+ if (g_strcmp0(obj_path, "/org/bluez/hci0") == 0)
_bt_core_adapter_removed_cb();
- }
+
} else { /* NameOwnerChanged */
const char *name = NULL;
const char *old_owner = NULL;
node_info->interfaces[0],
&method_table,
NULL, NULL, &error);
+ g_dbus_node_info_unref(node_info);
if (obj_id == 0) {
BT_ERR("Failed to register: %s", error->message);
g_error_free(error);
NULL, "org.freedesktop.DBus.ObjectManager",
"InterfacesAdded", NULL, NULL,
0, __bt_core_event_filter, NULL, NULL);
- sig_id2 = g_dbus_connection_signal_subscribe(conn,
+ sig_id3 = g_dbus_connection_signal_subscribe(conn,
NULL, "org.freedesktop.DBus.ObjectManager",
"InterfacesRemoved", NULL,
NULL, 0, __bt_core_event_filter, NULL, NULL);
projects / platform / core / connectivity / bluetooth-frwk.git / blobdiff