Modify the timing to set local device name

This patchset is to resolve TCT fail issue. Did not change the naming
using set local name API

Change-Id: Ic4c6e9b36c59c600663648fc3bae8da957ef7190

diff --git a/bt-api/bt-hdp.c b/bt-api/bt-hdp.c
index 644a476..161a1ee 100644 (file)
--- a/bt-api/bt-hdp.c
+++ b/bt-api/bt-hdp.c
@@ -289,8 +289,6 @@ static int __bt_hdp_internal_add_filter(void)
        if (dbus_connection_add_filter(g_hdp_dus_conn,
                        __bt_hdp_internal_event_filter, NULL, NULL) != TRUE) {
                BT_ERR("Fail to add dbus filter");
-               return BLUETOOTH_ERROR_INTERNAL;
-
        }
 
        dbus_bus_add_match(g_hdp_dus_conn,

diff --git a/bt-service/bt-service-adapter.c b/bt-service/bt-service-adapter.c
index f343914..dd48d42 100644 (file)
--- a/bt-service/bt-service-adapter.c
+++ b/bt-service/bt-service-adapter.c
@@ -478,8 +478,6 @@ static int __bt_set_enabled(void)
 
        __bt_set_visible_mode();
 
-       __bt_set_local_name();
-
        /* Update Bluetooth Status to notify other modules */
        if (vconf_set_int(VCONFKEY_BT_STATUS, VCONFKEY_BT_STATUS_ON) != 0)
                BT_ERR("Set vconf failed\n");
@@ -546,6 +544,8 @@ void _bt_handle_power_saving_mode_noti(void)
 
 void _bt_handle_adapter_added(void)
 {
+       __bt_set_local_name();
+
        if (timer_id > 0)
                g_source_remove(timer_id);