Fix : Some properties of adapter couldn't be handled
[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-event-receiver.c
index 639e932..c38dbab 100644 (file)
 #include "bt-service-proximity.h"
 
 #include "bt-service-opp-client.h"
+#include "bt-service-map-client.h"
+#include "bt-service-tds.h"
+#include "bt-service-otp.h"
 
-#ifdef TIZEN_DPM_ENABLE
+#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-service-dpm.h"
 #endif
 
 static GDBusConnection *manager_conn;
 static GDBusConnection *obexd_conn;
 static GDBusConnection *opc_obexd_conn;
+static GDBusConnection *map_obexd_conn;
 
 static GList *p_cache_list = NULL;
 
 static guint event_id;
+static guint le_scan_event_id = 0;
 static guint session_reinit_timer;
 guint nap_connected_device_count = 0;
 static guint hid_connected_device_count = 0;
@@ -76,17 +81,21 @@ typedef enum {
        OBEX_PCSUITE = (1 << 6),
        OBEX_SYNCEVOLUTION = (1 << 7),
        OBEX_MAS = (1 << 8),
+       OBEX_MAP = (1 << 9),
 } bluetooth_obex_connection_type_t;
 
 void _bt_handle_property_changed_event(GVariant *msg, const char *object_path);
 void _bt_opc_property_changed_event(GVariant *msg, char *path);
+void _bt_map_property_changed_event(GVariant *msg, const char *path);
 int _bt_register_service_event(GDBusConnection *g_conn, int event_type);
 void _bt_unregister_service_event(GDBusConnection *g_conn, int event_type);
 void _bt_opp_client_event_deinit(void);
+void _bt_map_client_event_deinit(void);
 void _bt_handle_network_client_event(GVariant *msg_iter,
                                const char *path);
 void __bt_gatt_char_property_changed_event(GVariant *msg_iter,
                                const char *path);
+void _bt_map_on_transfer_finished(const char *transfer_object_path, const int error);
 
 static void __bt_free_bt_le_adv_info_t(gpointer data)
 {
@@ -344,7 +353,7 @@ gboolean _bt_discovery_finished_cb(gpointer user_data)
 static gboolean __bt_le_discovery_finished_cb(gpointer user_data)
 {
        int result = BLUETOOTH_ERROR_NONE;
-       event_id = 0;
+       le_scan_event_id = 0;
        GVariant *param = NULL;
        if (_bt_get_discovering_property(DISCOVERY_ROLE_LE) == FALSE) {
                if (_bt_get_cancel_by_user() == TRUE)
@@ -400,34 +409,20 @@ void __bt_update_remote_cache_devinfo(const char *address, gboolean paired_statu
        BT_DBG("-");
 }
 
-static void __bt_device_remote_connected_properties(
-                               bt_remote_dev_info_t *remote_dev_info,
-                               char *address, gboolean connected)
+gboolean __bt_handle_is_flight_mode_enabled(void)
 {
-       int result = BLUETOOTH_ERROR_NONE;
-       int i;
-       GVariant *param = NULL;
-       BT_DBG("+");
+       int is_flight_mode = 0;
+       int ret = -1;
 
-       if (remote_dev_info->uuid_count > 0) {
-               for (i = 0; i < remote_dev_info->uuid_count; i++) {
-                       char *uuid = remote_dev_info->uuids[i];
-                       if (strcasecmp(uuid, HID_UUID) == 0) {
-                               int event = BLUETOOTH_EVENT_NONE;
+       if (TIZEN_FEATURE_FLIGHTMODE_ENABLED) {
+               ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
+               if (ret != 0)
+                       BT_ERR("vconf_get_bool failed");
 
-                               event = (connected == TRUE) ?
-                                       BLUETOOTH_HID_CONNECTED :
-                                       BLUETOOTH_HID_DISCONNECTED;
-                               param = g_variant_new("(is)", result,
-                                                       address);
-                               _bt_send_event(BT_HID_EVENT, event,
-                                       param);
-                               break;
-                       }
-               }
+               return (is_flight_mode == 0) ? FALSE : TRUE;
+       } else {
+               return FALSE;
        }
-
-       BT_DBG("-");
 }
 
 void _bt_handle_adapter_event(GVariant *msg, const char *member)
@@ -468,8 +463,6 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member)
 
                /* Bonding from remote device */
                address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-               if (address == NULL)
-                       return;
 
                g_variant_get(msg, "(&o)", &object_path);
 
@@ -519,18 +512,21 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member)
                param = g_variant_new("(ii)", result,
                                        adv_handle);
 
-#if 0
                const char *sender;
                sender = _bt_get_adv_slot_owner(slot_id);
                _bt_send_event_to_dest(sender, BT_ADAPTER_EVENT,
                                event,
                                param);
-#else
-               _bt_send_event(BT_ADAPTER_EVENT, event, param);
-#endif
 
-               if (event == BLUETOOTH_EVENT_ADVERTISING_STOPPED)
+               if (event == BLUETOOTH_EVENT_ADVERTISING_STOPPED) {
+                       char *name = g_strdup(sender);
+
                        _bt_unregister_adv_slot_owner(slot_id);
+
+                       /* Advertising disabled, notify TDS */
+                       _bt_tds_handle_adv_disabled(name, adv_handle);
+                       g_free(name);
+               }
        } else if (strcasecmp(member, "RssiEnabled") == 0) {
                BT_DBG("RSSI Enabled");
                gboolean status = FALSE;
@@ -577,13 +573,13 @@ void _bt_handle_adapter_event(GVariant *msg, const char *member)
                                param);
                g_free(address);
        } else if (strcasecmp(member, BT_HARDWARE_ERROR) == 0) {
-               BT_ERR_C("Hardware error received from BLUEZ");
+               BT_ERR_C("### Hardware error received from BLUEZ");
 /* Don't add the recovery logic into platform */
 #if 0
                _bt_recover_adapter();
 #endif
        } else if (strcasecmp(member, BT_TX_TIMEOUT_ERROR) == 0) {
-               BT_ERR_C("Tx timeout error received from BLUEZ");
+               BT_ERR_C("### Tx timeout error received from BLUEZ");
 /* Don't add the recovery logic into platform */
 #if 0
                _bt_recover_adapter();
@@ -603,15 +599,21 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
        GError *err = NULL;
        char *property = NULL;
        GVariant *param = NULL;
+
        g_variant_iter_init(&value_iter, msg);
        while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) {
                BT_INFO("Property %s", property);
 
                if (strcasecmp(property, "Discovering") == 0) {
                        gboolean discovering = FALSE;
+
+                       if (_bt_adapter_get_status() != BT_ACTIVATED)
+                               continue;
+
                        g_variant_get(val, "b", &discovering);
-                       /* Send event to application */
                        BT_DBG("Discovering %d", discovering);
+
+                       /* Send event to application */
                        if (discovering == TRUE) {
                                _bt_set_discovery_status(TRUE);
                                param = g_variant_new("(i)", result);
@@ -619,10 +621,12 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                                        BLUETOOTH_EVENT_DISCOVERY_STARTED,
                                        param);
                        } else {
-                               ret_if(event_id > 0);
+                               if (event_id > 0)
+                                       continue;
 
                                adapter_proxy = _bt_get_adapter_proxy();
-                               ret_if(adapter_proxy == NULL);
+                               if (adapter_proxy == NULL)
+                                       continue;
 
                                /* Need to stop searching */
                                ret = g_dbus_proxy_call_sync(adapter_proxy, "StopDiscovery",
@@ -643,26 +647,34 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                } else if (strcasecmp(property, "LEDiscovering") == 0) {
                        gboolean le_discovering = FALSE;
 
+                       if (_bt_adapter_get_status() != BT_ACTIVATED ||
+                           _bt_adapter_get_le_status() != BT_LE_ACTIVATED)
+                               continue;
+
                        g_variant_get(val, "b", &le_discovering);
+                       BT_DBG("LEDiscovering %d", le_discovering);
+
                        /* Send event to application */
                        if (le_discovering == TRUE) {
                                _bt_set_le_scan_status(TRUE);
                                param = g_variant_new("(i)", result);
                                _bt_send_event(BT_LE_ADAPTER_EVENT,
-                               BLUETOOTH_EVENT_LE_DISCOVERY_STARTED,
-                               param);
+                                       BLUETOOTH_EVENT_LE_DISCOVERY_STARTED,
+                                       param);
                        } else {
-                               ret_if(event_id > 0);
+                               if (le_scan_event_id > 0)
+                                       continue;
 
                                adapter_proxy = _bt_get_adapter_proxy();
-                               ret_if(adapter_proxy == NULL);
+                               if (adapter_proxy == NULL)
+                                       continue;
 
                                /* Need to stop searching */
                                ret = g_dbus_proxy_call_sync(adapter_proxy, "StopLEDiscovery",
-                                       NULL,
-                                       G_DBUS_CALL_FLAGS_NONE,
-                                       DBUS_TIMEOUT, NULL,
-                                       &err);
+                                               NULL,
+                                               G_DBUS_CALL_FLAGS_NONE,
+                                               DBUS_TIMEOUT, NULL,
+                                               &err);
                                if (err) {
                                        BT_ERR("Dbus Error %s", err->message);
                                        g_clear_error(&err);
@@ -670,27 +682,25 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                                if (ret)
                                        g_variant_unref(ret);
 
-                               event_id = g_timeout_add(BT_DISCOVERY_FINISHED_DELAY,
+                               le_scan_event_id = g_timeout_add(BT_DISCOVERY_FINISHED_DELAY,
                                                (GSourceFunc)__bt_le_discovery_finished_cb, NULL);
-                               }
+                       }
                } else if (strcasecmp(property, "Name") == 0) {
                        char *name = NULL;
-                       g_variant_get(val, "s", &name);
+                       g_variant_get(val, "&s", &name);
                        param = g_variant_new("(is)", result, name);
                        /* Send event to application */
                        _bt_send_event(BT_ADAPTER_EVENT,
                                BLUETOOTH_EVENT_LOCAL_NAME_CHANGED,
                                param);
-                       g_free(name);
                } else if (strcasecmp(property, "Alias") == 0) {
                        char *alias = NULL;
-                       g_variant_get(val, "s", &alias);
+                       g_variant_get(val, "&s", &alias);
                        param = g_variant_new("(is)", result, alias);
                        /* Send event to application */
                        _bt_send_event(BT_ADAPTER_EVENT,
                                BLUETOOTH_EVENT_LOCAL_NAME_CHANGED,
                                param);
-                       g_free(alias);
                } else if (strcasecmp(property, "Discoverable") == 0) {
                        gboolean discoverable = FALSE;
 
@@ -701,7 +711,8 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                                if (_bt_get_discoverable_timeout_property() > 0) {
                                        int time = 0;
                                        adapter_proxy = _bt_get_adapter_properties_proxy();
-                                       ret_if(adapter_proxy == NULL);
+                                       if (adapter_proxy == NULL)
+                                               continue;
                                        ret = g_dbus_proxy_call_sync(adapter_proxy, "Set",
                                                g_variant_new("(ssv)", BT_ADAPTER_INTERFACE,
                                                "DiscoverableTimeout",
@@ -730,11 +741,8 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                                _bt_get_discoverable_mode(&mode);
 
                                /* Event will be sent by "DiscoverableTimeout" signal */
-                               if (mode != BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE) {
-                                       g_free(property);
-                                       g_variant_unref(val);
-                                       return;
-                               }
+                               if (mode != BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE)
+                                       continue;
 
                                /* Send event to application */
                                BT_INFO("[General Discoverable]");
@@ -748,11 +756,8 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
 
                        /* Event was already sent by "Discoverable" signal */
                        if (mode == BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE ||
-                               mode == BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE) {
-                               g_free(property);
-                               g_variant_unref(val);
-                               return;
-                       }
+                           mode == BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE)
+                               continue;
 
                        /* Send event to application */
                        BT_INFO("[Limited Discoverable (Timeout %u secs)]",
@@ -769,22 +774,24 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                        g_variant_get(val, "b", &powered);
                        BT_DBG("Powered = %d", powered);
                        if (powered == FALSE) {
-#ifdef USB_BLUETOOTH
-                               _bt_handle_adapter_removed();
-#else
-                               if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_state) == 0 &&
-                               bt_state != VCONFKEY_BT_STATUS_OFF) {
-                                       _bt_disable_adapter();
+                               if (TIZEN_FEATURE_BT_USB_DONGLE) {
+                                       _bt_handle_adapter_removed();
+                               } else {
+                                       if (vconf_get_int(VCONFKEY_BT_STATUS, &bt_state) == 0 &&
+                                       bt_state != VCONFKEY_BT_STATUS_OFF) {
+                                               if (__bt_handle_is_flight_mode_enabled() == FALSE)
+                                                       _bt_disable_adapter();
+                                               else
+                                                       _bt_handle_adapter_removed();
+                                       }
                                }
-#endif
                                if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &bt_state) == 0 &&
                                        bt_state != VCONFKEY_BT_LE_STATUS_OFF) {
                                        _bt_set_le_disabled(BLUETOOTH_ERROR_NONE);
                                }
                        } else {
-#ifdef USB_BLUETOOTH
-                               _bt_handle_adapter_added();
-#endif
+                               if (TIZEN_FEATURE_BT_USB_DONGLE)
+                                       _bt_handle_adapter_added();
                        }
                } else if (strcasecmp(property, "Connectable") == 0) {
                        gboolean connectable = FALSE;
@@ -806,16 +813,18 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                        char *name = NULL;
                        char *value = NULL;
                        GVariantIter *iter = NULL;
+
                        g_variant_get(val, "as", &iter);
-                       while (g_variant_iter_loop(iter, "s", &name)) {
-                               BT_DBG("name = %s", name);
-                               g_variant_iter_loop(iter, "s", &value);
-                               BT_DBG("Value = %s", value);
-                               if (FALSE == _bt_update_le_feature_support(name, value))
-                                       BT_INFO("Fail to update LE feature info");
+                       if (iter == NULL)
+                               continue;
+
+                       while (g_variant_iter_next(iter, "&s", &name) &&
+                              g_variant_iter_next(iter, "&s", &value)) {
+                               BT_DBG("name = %s, Value = %s", name, value);
+                               if (!_bt_update_le_feature_support(name, value))
+                                       BT_ERR("Failed to update LE feature (name = %s, value = %s)", name, value);
                        }
-                       if (iter)
-                               g_variant_iter_free(iter);
+                       g_variant_iter_free(iter);
                } else if (strcasecmp(property, "IpspInitStateChanged") == 0) {
                        gboolean ipsp_initialized = FALSE;
 
@@ -828,7 +837,7 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                                        BLUETOOTH_EVENT_IPSP_INIT_STATE_CHANGED,
                                        param);
                } else {
-                       BT_DBG("property : [%s]", property);
+                       BT_DBG("Unhandled property : [%s]", property);
                }
        }
 }
@@ -872,6 +881,7 @@ static void __bt_obex_property_changed_event(GVariant *msg, const char *path)
 
                        _bt_obex_transfer_progress(path, transferred);
                }
+               /* TODO: MAP, "Complete"? see above */
                g_free(property);
                g_variant_unref(val);
                g_variant_unref(child);
@@ -890,8 +900,10 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path)
        char *property = NULL;
        char *address;
        GVariant *param = NULL;
-       bt_remote_dev_info_t *remote_dev_info;
        g_variant_iter_init(&value_iter, msg);
+#ifdef TIZEN_FEATURE_BT_DPM
+       int desktop_state = DPM_BT_ERROR;
+#endif
        while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) {
                BT_DBG("Property %s", property);
                if (strcasecmp(property, "Connected") == 0) {
@@ -910,15 +922,6 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path)
                        BT_DBG("connected: %d", connected);
                        BT_DBG("address: %s", address);
 
-                       remote_dev_info = _bt_get_remote_device_info_by_object_path(path);
-
-                       if (remote_dev_info != NULL) {
-                               __bt_device_remote_connected_properties(
-                                               remote_dev_info, address,
-                                               connected != BLUETOOTH_CONNECTED_LINK_NONE ?
-                                               TRUE : FALSE);
-                               _bt_free_device_info(remote_dev_info);
-                       }
                        param = g_variant_new("(is)", result, address);
                        /* Send event to application */
                        _bt_send_event(BT_DEVICE_EVENT,
@@ -933,11 +936,12 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path)
                        _bt_convert_device_path_to_address(path, address);
                        BT_DBG("address: %s", address);
 
+                       g_free(address);
+
                        remote_dev_info = _bt_get_remote_device_info_by_object_path(path);
                        if (remote_dev_info == NULL) {
                                g_free(property);
                                g_variant_unref(val);
-                               g_free(address);
                                return;
                        }
                        BT_DBG("Address type  %d", remote_dev_info->addr_type);
@@ -945,9 +949,9 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path)
                        if (remote_dev_info->addr_type == 0) {
                                BT_DBG("Name %s", remote_dev_info->name);
 
-#ifdef TIZEN_DPM_ENABLE
-                               if (_bt_dpm_get_bluetooth_desktop_connectivity_state() ==
-                                                       DPM_RESTRICTED) {
+#ifdef TIZEN_FEATURE_BT_DPM
+                               _bt_dpm_get_bluetooth_desktop_connectivity_state(&desktop_state);
+                               if (desktop_state == DPM_RESTRICTED) {
                                        bluetooth_device_class_t device_class;
                                        _bt_divide_device_class(&device_class, remote_dev_info->class);
 
@@ -956,7 +960,6 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path)
                                                _bt_free_device_info(remote_dev_info);
                                                g_free(property);
                                                g_variant_unref(val);
-                                               g_free(address);
                                                return;
                                        }
                                }
@@ -993,7 +996,6 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path)
                                _bt_send_event(BT_ADAPTER_EVENT,
                                        BLUETOOTH_EVENT_REMOTE_DEVICE_FOUND,
                                        param);
-                               g_free(address);
                        }
                        _bt_free_device_info(remote_dev_info);
                } else if (strcasecmp(property, "GattConnected") == 0) {
@@ -1147,7 +1149,8 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path)
                        }
 
                        BT_DBG("LegacyPairing Failed with %s. Show Error Popup", remote_dev_info->name);
-                       _bt_launch_system_popup(BT_AGENT_EVENT_LEGACY_PAIR_FAILED_FROM_REMOTE,
+                       if (headed_plugin_info->plugin_headed_enabled)
+                               headed_plugin_info->headed_plugin->bt_launch_system_popup(BT_AGENT_EVENT_LEGACY_PAIR_FAILED_FROM_REMOTE,
                                                remote_dev_info->name, auth_info, NULL, NULL, NULL);
 
                        _bt_free_device_info(remote_dev_info);
@@ -1239,7 +1242,6 @@ static void __bt_media_control_changed_event(GVariant *msg, const char *path)
        char *address;
        GVariant *val = NULL;
        GVariant *child = NULL;
-       bt_remote_dev_info_t *remote_dev_info;
        GVariant *param = NULL;
        g_variant_iter_init(&value_iter, msg);
        while ((child = g_variant_iter_next_value(&value_iter))) {
@@ -1260,13 +1262,6 @@ static void __bt_media_control_changed_event(GVariant *msg, const char *path)
                        BT_DBG("connected: %d", connected);
                        BT_DBG("address: %s", address);
 
-                       remote_dev_info = _bt_get_remote_device_info(address);
-
-                       if (remote_dev_info != NULL) {
-                               __bt_device_remote_connected_properties(
-                               remote_dev_info, address, connected);
-                               _bt_free_device_info(remote_dev_info);
-                       }
                        param = g_variant_new("(is)", result, address);
                        /* Send event to application */
                        _bt_send_event(BT_AVRCP_EVENT,
@@ -1299,7 +1294,7 @@ static void _bt_handle_pxp_property_changed_event(GVariant *msg, const char *pat
 {
        int result = BLUETOOTH_ERROR_NONE;
        int service_type;
-       int alert_lvl;
+       int alert_lvl = -1;
        GVariantIter value_iter;
        char *property = NULL;
        char *address;
@@ -1326,7 +1321,8 @@ static void _bt_handle_pxp_property_changed_event(GVariant *msg, const char *pat
                                service_type = BT_PXP_PROPERTY_IAS;
 
                        g_variant_get(val, "s", &alert_str);
-                       alert_lvl = get_alert_level_enum(alert_str);
+                       if (alert_str)
+                               alert_lvl = get_alert_level_enum(alert_str);
 
                        param = g_variant_new("(isiii)", result, address,
                                                                role, service_type, alert_lvl);
@@ -1378,10 +1374,6 @@ void _bt_handle_property_changed_event(GVariant *msg, const char *object_path)
                BT_DBG("BT_PROXIMITY_REPORTER_INTERFACE");
                _bt_handle_pxp_property_changed_event(val,
                                        object_path, BT_PXP_REPORTER_ROLE);
-       } else if (strcasecmp(interface_name, BT_PROXIMITY_MONITOR_INTERFACE) == 0) {
-               BT_DBG("BT_PROXIMITY_MONITOR_INTERFACE");
-               _bt_handle_pxp_property_changed_event(val,
-                                       object_path, BT_PXP_MONITOR_ROLE);
        }
        g_variant_unref(val);
 }
@@ -1395,7 +1387,7 @@ void __bt_opc_property_changed_event(GVariant *msg,
        GVariant *child = NULL;
 
        g_variant_iter_init(&value_iter, msg);
-       while ((child = g_variant_iter_next_value(&value_iter))) {
+       if ((child = g_variant_iter_next_value(&value_iter))) {
                g_variant_get(child, "{sv}", &property, &val);
                ret_if(property == NULL);
 
@@ -1442,6 +1434,68 @@ void _bt_opc_property_changed_event(GVariant *msg, char *path)
 }
 
 
+void __bt_map_property_changed_event(GVariant *msg,
+                                               const char *path)
+{
+       BT_DBG("Entered");
+       GVariantIter value_iter;
+       char *property = NULL;
+       GVariant *val = NULL;
+       GVariant *child = NULL;
+
+       g_variant_iter_init(&value_iter, msg);
+       while ((child = g_variant_iter_next_value(&value_iter))) {
+               g_variant_get(child, "{sv}", &property, &val);
+               ret_if(property == NULL);
+
+               if (strcasecmp(property, "Status") == 0) {
+                       char *status = NULL;
+                       g_variant_get(val, "s", &status);
+                       BT_DBG("Status is %s", status);
+
+                       if (strcasecmp(status, "active") == 0) {
+                               BT_DBG("EVENT : STARTED");
+                               // currently doing nothing
+                       } else if (strcasecmp(status, "complete") == 0) {
+                               BT_DBG("EVENT : COMPLETED");
+                               _bt_map_on_transfer_finished(path, BLUETOOTH_ERROR_NONE);
+                       } else if (strcasecmp(status, "error") == 0) {
+                               BT_DBG("EVENT : FAILED");
+                               _bt_map_on_transfer_finished(path, BLUETOOTH_ERROR_INTERNAL);
+                       }
+                       g_free(status);
+               } else if (strcasecmp(property, "Transferred") == 0) {
+                       guint64 transferred  = 0;
+                       g_variant_get(val, "t", &transferred);
+
+                       BT_DBG("EVENT : PROGRESS CALLBACK");
+                       // currently doing nothing - progress callback type is not used
+               } else {
+                       BT_DBG("OTHER EVENT : property : [%s]", property);
+               }
+               g_free(property);
+               g_variant_unref(child);
+               g_variant_unref(val);
+       }
+}
+
+void _bt_map_property_changed_event(GVariant *msg, const char *path)
+{
+       BT_DBG("Entered _bt_map_property_changed_event");
+       char *interface_name = NULL;
+       GVariant *value = NULL;
+       g_variant_get(msg, "(&s@a{sv}@as)", &interface_name, &value, NULL);
+       BT_INFO("interface_name = %s", interface_name);
+       if (strcasecmp(interface_name, BT_OBEX_TRANSFER_INTERFACE) == 0) {
+               __bt_map_property_changed_event(value,
+                               path);
+       } else {
+               BT_DBG("interface_name : [%s]", interface_name);
+       }
+       g_variant_unref(value);
+}
+
+
 void _bt_handle_input_event(GVariant *msg, const char *path)
 {
        int result = BLUETOOTH_ERROR_NONE;
@@ -1592,91 +1646,35 @@ void __bt_gatt_char_property_changed_event(GVariant *msg,
 {
        GVariantIter value_iter;
        char *property = NULL;
-       char * char_handle = NULL;
        GVariant *val = NULL;
-       int result = BLUETOOTH_ERROR_NONE;
-       GVariant *param = NULL;
        g_variant_iter_init(&value_iter, msg);
-       char_handle = g_strdup(path);
        while ((g_variant_iter_loop(&value_iter, "{sv}", &property, &val))) {
-               BT_INFO("Property %s", property);
+               BT_DBG("Property %s", property);
 
                ret_if(property == NULL);
 
                if (strcasecmp(property, "Notifying") == 0) {
                        gboolean property_flag = FALSE;
                        g_variant_get(val, "b", &property_flag);
-                       if (property_flag == TRUE)
-                               BT_DBG("notifying is enabled");
-                       else
-                               BT_DBG("notifying is disabled");
-               } else if (strcasecmp(property, "ChangedValue") == 0) {
-                       int len = 0;
-                       GByteArray *gp_byte_array = NULL;
-                       BT_INFO("Type '%s'\n", g_variant_get_type_string(val));
-
-                       if (val) {
-                               gp_byte_array = g_byte_array_new();
-                               len = g_variant_get_size(val);
-                               BT_DBG("Len = %d", len);
-                               g_byte_array_append(gp_byte_array,
-                                       (const guint8 *) g_variant_get_data(val), len);
-                               if (gp_byte_array->len != 0) {
-                                       GVariant *byte_array = NULL;
-                                       byte_array = g_variant_new_from_data(
-                                                               G_VARIANT_TYPE_BYTESTRING,
-                                                               gp_byte_array->data,
-                                                               gp_byte_array->len,
-                                                               TRUE, NULL, NULL);
-                                       param = g_variant_new("(is@ay)", result, char_handle,
-                                                               byte_array);
-
-                                       /* Send event only registered client */
-                                       _bt_send_char_value_changed_event(param);
-                               }
-                               g_byte_array_free(gp_byte_array, TRUE);
-                       }
+                       BT_INFO("Notifying is %s", property_flag ? "enabled" : "disabled");
                }
        }
-       g_free(char_handle);
 }
 
 void _bt_handle_gatt_event(GVariant *msg, const char *member, const char *path)
 {
        ret_if(path == NULL);
-
        if (strcasecmp(member, "GattValueChanged") == 0) {
-
-#if 0 // Debug Only
-               /*** Debug only ***/
-               GVariant *value = NULL;
-               int value_len = 0;
-               char *buffer = NULL;
-
-               g_variant_get(msg, "(is@ay)", NULL, NULL, &value);
-               value_len = g_variant_get_size(value);
-               if (value_len > 0) {
-                       char buf[8 * 5 + 1] = { 0 };
-                       int i;
-                       int to;
-                       buffer = (char *)g_variant_get_data(value);
-                       to = value_len > (sizeof(buf) / 5) ? sizeof(buf) / 5 : value_len;
-
-                       for (i = 0; i < to; i++)
-                               snprintf(&buf[i * 5], 6, "0x%02x ", buffer[i]);
-                       buf[i * 5] = '\0';
-                       BT_DBG("GATT Val[%d] %s", value_len, buf);
-               }
-               g_variant_unref(value);
-               /******/
+               /* Check TDS seekers waiting for Indication  */
+               _bt_tds_check_indication(path, msg);
+#ifdef TIZEN_FEATURE_BT_OTP
+               _bt_otp_check_indication(path, msg);
 #endif
-
-               /* Send event only registered client */
-               _bt_send_char_value_changed_event(msg);
+       } else {
+               BT_INFO("Unhandled event");
        }
 }
 
-
 void _bt_handle_device_event(GVariant *msg, const char *member, const char *path)
 {
        int event = 0;
@@ -1698,7 +1696,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        gboolean connected = FALSE;
                        char *address;
                        address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-                       ret_if(address == NULL);
 
                        _bt_convert_device_path_to_address(path, address);
                        g_variant_get(msg, "(b)", &connected);
@@ -1731,7 +1728,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        }
 
                        address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-                       ret_if(address == NULL);
 
                        _bt_convert_device_path_to_address(path, address);
 
@@ -1782,7 +1778,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        ret_if(_bt_is_device_creating() == TRUE);
 
                        address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-                       ret_if(address == NULL);
 
                        _bt_convert_device_path_to_address(path, address);
 
@@ -1832,10 +1827,9 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                g_variant_get(msg, "(y)", &addr_type);
 
                address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-               ret_if(address == NULL);
 
                _bt_convert_device_path_to_address(path, address);
-               dev_name = _bt_get_bonded_device_name(address);
+               dev_name = _bt_get_device_name(address);
 
                _bt_convert_addr_string_to_secure_string(secure_address, address);
                BT_INFO("Address : %s Type : %d", secure_address, addr_type);
@@ -1843,6 +1837,9 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                                !addr_type ? dev_name : secure_address);
                g_free(dev_name);
 
+               if (addr_type)
+                       _bt_add_le_connected_dev_info(address);
+
                _bt_logging_connection(TRUE, addr_type);
                param = g_variant_new("(isy)", result, address, addr_type);
                /*Send event to application*/
@@ -1861,7 +1858,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                result = disc_reason;
 
                address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-               ret_if(address == NULL);
 
                _bt_convert_device_path_to_address(path, address);
 
@@ -1870,15 +1866,17 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                      0x02 BDADDR_LE_RANDOM */
                _bt_convert_addr_string_to_secure_string(secure_address, address);
                BT_INFO("Address : %s Type : %d", secure_address, addr_type);
-               BT_ERR_C("### Disconnected [%s] [%d : %s] [%s]", !addr_type ? "BREDR" : "LE",
-                               disc_reason, _bt_convert_disc_reason_to_string(disc_reason),
-                               !addr_type ? dev_name : secure_address);
+               BT_ERR_C("### Disconnected [%s] [%s] [%d : %s]", !addr_type ? "BREDR" : "LE",
+                               !addr_type ? dev_name : secure_address,
+                               disc_reason, _bt_convert_disc_reason_to_string(disc_reason));
                g_free(dev_name);
 
                _bt_headset_set_local_connection(FALSE);
                _bt_logging_connection(FALSE, addr_type);
 
-               if (!addr_type) {
+               if (addr_type)
+                       _bt_remove_le_connected_dev_info(address);
+               else {
 #ifdef TIZEN_BT_A2DP_SINK_AUTO_CONNECT
                        {
                                int bt_device_state = VCONFKEY_BT_DEVICE_NONE;
@@ -1912,6 +1910,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        _bt_opp_client_is_sending(&sending);
                        if (sending == TRUE)
                                _bt_opp_client_check_pending_transfer(address);
+                       /* TODO: MAP? see above */
                }
                param = g_variant_new("(isy)", result, address, addr_type);
                _bt_send_event(BT_DEVICE_EVENT,
@@ -1927,7 +1926,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                g_variant_get(msg, "(si)", &profile_uuid, &state);
 
                address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-               ret_if(address == NULL);
 
                _bt_convert_device_path_to_address(path, address);
                _bt_convert_addr_string_to_type(bd_addr.addr, address);
@@ -1941,21 +1939,23 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        (state == BT_PROFILE_STATE_CONNECTED)) {
 
                        int event = BLUETOOTH_EVENT_AV_CONNECTED;
-                       char connected_address[BT_ADDRESS_STRING_SIZE + 1];
+#ifndef TIZEN_BT_DUAL_HEADSET_CONNECT
                        bluetooth_device_address_t device_address;
+                       char connected_address[BT_ADDRESS_STRING_SIZE + 1];
                        gboolean connected;
+#endif
                        bt_headset_wait_t *wait_list;
-                       guint restricted = 0x0;
+                       guint trusted = TRUE;
 
                        __bt_set_device_values(TRUE,
                                VCONFKEY_BT_DEVICE_A2DP_HEADSET_CONNECTED);
 
                        __bt_connection_manager_set_state(address, event);
 
-                       _bt_get_restrict_profile(&bd_addr, RESTRICTED_PROFILE_HFP_HS, &restricted);
+                       _bt_get_trust_profile(&bd_addr, TRUSTED_PROFILE_HFP_HF, &trusted);
 
                        if (_bt_headset_get_local_connection() == FALSE) {
-                               if (restricted == 0x0) /* not restricted*/
+                               if (trusted == TRUE) /* not restricted*/
                                        _bt_start_timer_for_connection(address, BT_AUDIO_HSP);
                        } else {
                                /* Connection Started from local device therefore no need to
@@ -1965,6 +1965,10 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        param = g_variant_new("(is)", result, address);
                        _bt_send_event(BT_HEADSET_EVENT, event,
                                param);
+#ifdef TIZEN_BT_DUAL_HEADSET_CONNECT
+                       _bt_check_already_connected_headset(BT_AUDIO_A2DP,
+                                               address);
+#else
                        connected = _bt_is_headset_type_connected(BT_AUDIO_A2DP,
                                                connected_address);
                        if (connected) {
@@ -1976,7 +1980,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                                                &device_address, NULL);
                                }
                        }
-
+#endif
                        _bt_add_headset_to_list(BT_AUDIO_A2DP,
                                                BT_STATE_CONNECTED, address);
 
@@ -2116,6 +2120,18 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                        param = g_variant_new("(is)", result, address);
                        _bt_send_event(BT_HID_EVENT, event,
                                param);
+
+                       /* Set the vconf value for device */
+                       if (state == BT_PROFILE_STATE_CONNECTED) {
+                               hid_connected_device_count++;
+                               __bt_set_device_values(TRUE,
+                                               VCONFKEY_BT_DEVICE_HID_CONNECTED);
+                       } else {
+                               hid_connected_device_count--;
+                               if (hid_connected_device_count == 0)
+                                       __bt_set_device_values(FALSE,
+                                               VCONFKEY_BT_DEVICE_HID_CONNECTED);
+                       }
                } else if (strcmp(profile_uuid, HID_DEVICE_UUID) == 0) {
                        if (state == BT_PROFILE_STATE_CONNECTED) {
                                int event;
@@ -2142,8 +2158,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                ret_if(_bt_is_le_scanning() == FALSE);
 
                le_dev_info = g_malloc0(sizeof(bt_remote_le_dev_info_t));
-               if (le_dev_info == NULL)
-                       return;
 
                g_variant_get(msg, "(syyii@ay)", &le_dev_info->address,
                                                &le_dev_info->addr_type,
@@ -2151,6 +2165,12 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                                                &le_dev_info->rssi,
                                                &le_dev_info->adv_data_len,
                                                &value);
+
+               if (value == NULL) {
+                       _bt_free_le_device_info(le_dev_info);
+                       return;
+               }
+
                _bt_convert_device_path_to_address(path, le_dev_info->address);
 
                buffer_len = g_variant_get_size(value);
@@ -2174,21 +2194,13 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
 
                if (le_dev_info->adv_type != BT_LE_ADV_SCAN_RSP) {       /* ADV_IND */
                        adv_info = g_malloc0(sizeof(bt_le_adv_info_t));
-                       if (adv_info == NULL) {
-                               _bt_free_le_device_info(le_dev_info);
-                               g_variant_unref(value);
-                               return;
-                       }
-
                        adv_info->addr = g_strdup(le_dev_info->address);
                        adv_info->addr_type = le_dev_info->addr_type;
                        adv_info->rssi = le_dev_info->rssi;
                        adv_info->data_len = le_dev_info->adv_data_len;
                        adv_info->data = g_malloc0(le_dev_info->adv_data_len);
-                       if (adv_info->data) {
-                               memcpy(adv_info->data, le_dev_info->adv_data,
-                                               le_dev_info->adv_data_len);
-                       }
+                       memcpy(adv_info->data, le_dev_info->adv_data,
+                                       le_dev_info->adv_data_len);
 
                        if (__bt_add_adv_ind_info(adv_info) == 0) {
                                adv_info->timer_id = g_timeout_add(1000,
@@ -2224,6 +2236,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
        } else if  (strcasecmp(member, "IpspStateChanged") == 0) {
                gboolean connected = FALSE;
                char *ifname = NULL;
+               GVariant *ipsp_param = NULL;
 
                g_variant_get(msg, "(bs)", &connected, &ifname);
 
@@ -2233,34 +2246,88 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                address = g_malloc0(BT_ADDRESS_STRING_SIZE);
                _bt_convert_device_path_to_address(path, address);
 
-               BT_DBG("Ipsp BT Interface Name: %s", ifname);
-               BT_DBG("address: %s", address);
+               BT_DBG("Ipsp BT Interface Name: %s, address: %s", ifname, address);
+
                param = g_variant_new("(iss)", result, address, ifname);
+               ipsp_param = g_variant_new("(ss)", ifname, address);
+
+               g_free(ifname);
+
+               /* Set Ipv6 Addr */
+               GDBusProxy *ipsp_proxy;
+               if (connected) {
+                       BT_DBG("IPSP connected, Set Ipv6 Addr");
+                       ipsp_proxy = _bt_get_ipsp_proxy();
+                       if (ipsp_proxy == NULL) {
+                               BT_ERR("can not get ipsp proxy");
+                               g_free(address);
+                               g_variant_unref(param);
+                               g_variant_unref(ipsp_param);
+                               return;
+                       }
+
+                       g_dbus_proxy_call(ipsp_proxy, "SetIpv6Addr",
+                                       ipsp_param, G_DBUS_CALL_FLAGS_NONE,
+                                       -1, NULL, NULL, NULL);
+               } else {
+                       g_variant_unref(ipsp_param);
+                       BT_DBG("IPSP disconnected");
+                       ipsp_proxy = _bt_get_ipsp_proxy();
+                       if (ipsp_proxy == NULL) {
+                               BT_ERR("can not get ipsp proxy");
+                               g_free(address);
+                               g_variant_unref(param);
+                               return;
+                       }
+
+                       g_dbus_proxy_call(ipsp_proxy, "DisableIpsp",
+                                       NULL, G_DBUS_CALL_FLAGS_NONE,
+                                       -1, NULL, NULL, NULL);
+               }
 
                /* Send event to application */
+               _bt_send_event(BT_DEVICE_EVENT, event, param);
+               g_free(address);
+       } else if (strcasecmp(member, "AttMtuChanged") == 0) {
+               int result = BLUETOOTH_ERROR_NONE;
+               guint16 mtu = 0;
+               guint8 status = 0;
+
+               g_variant_get(msg, "(q)", &mtu);
+
+               address = g_malloc0(BT_ADDRESS_STRING_SIZE);
+
+               _bt_convert_device_path_to_address(path, address);
+               _bt_convert_addr_string_to_secure_string(secure_address, address);
+               BT_DBG("Address : %s MTU changed : %d", secure_address, mtu);
+
+               param = g_variant_new("(isqy)",
+                       result,
+                       address,
+                       mtu,
+                       status);
+
+               /* Send the event to application */
                _bt_send_event(BT_DEVICE_EVENT,
-                                               event,
-                                               param);
+                       BLUETOOTH_EVENT_GATT_ATT_MTU_CHANGED,
+                       param);
+
                g_free(address);
-       } else if (strcasecmp(member, "iBeaconReport") == 0) {
-               bt_remote_ibeacon_dev_info_t *ibeacon_dev_info = NULL;
+       }  else if (strcasecmp(member, "OtcDisconnected") == 0) {
+               gboolean connected = FALSE;
+               GVariant *otc_param = NULL;
 
-               ret_if(_bt_is_le_scanning() == FALSE);
+               address = g_malloc0(BT_ADDRESS_STRING_SIZE);
+               _bt_convert_device_path_to_address(path, address);
 
-               ibeacon_dev_info = g_malloc0(sizeof(bt_remote_ibeacon_dev_info_t));
-               if (ibeacon_dev_info == NULL)
-                       return;
+               BT_DBG("OTC Disconnected, address: %s", address);
+               otc_param = g_variant_new("(ibsn)", result, connected, address);
 
-               g_variant_get(msg, "(syuusuuy)", &ibeacon_dev_info->address,
-                                               &ibeacon_dev_info->addr_type,
-                                               &ibeacon_dev_info->company_id,
-                                               &ibeacon_dev_info->ibeacon_type,
-                                               &ibeacon_dev_info->uuid,
-                                               &ibeacon_dev_info->major_id,
-                                               &ibeacon_dev_info->minor_id,
-                                               &ibeacon_dev_info->measured_power);
-               _bt_send_ibeacon_scan_result_event(ibeacon_dev_info);
-               g_free(ibeacon_dev_info);
+               /* Send event to application */
+               _bt_send_event(BT_OTP_EVENT,
+                                               BLUETOOTH_EVENT_OTC_STATE_CHANGED,
+                                               otc_param);
+               g_free(address);
        }
 }
 
@@ -2271,7 +2338,7 @@ void __bt_set_audio_values(gboolean connected, char *address)
 
        /*  Set the headset name */
        if (connected == TRUE)
-               name = _bt_get_bonded_device_name(address);
+               name = _bt_get_device_name(address);
        else
                name = g_strdup("");
 
@@ -2323,22 +2390,20 @@ void _bt_handle_headset_event(GVariant *msg, const char *path)
                int event = BLUETOOTH_EVENT_NONE;
                bt_headset_wait_t *wait_list;
                char *address;
-               guint restricted = 0x0;
+               guint trusted = TRUE;
                g_variant_get(value, "b", &property_flag);
 
                address = g_malloc0(BT_ADDRESS_STRING_SIZE);
-               if (address == NULL)
-                       return;
 
                _bt_convert_device_path_to_address(path, address);
                _bt_convert_addr_string_to_type(bd_addr.addr, address);
 
                if (property_flag == TRUE) {
                        event = BLUETOOTH_EVENT_AG_CONNECTED;
-                       _bt_get_restrict_profile(&bd_addr, RESTRICTED_PROFILE_A2DP, &restricted);
+                       _bt_get_trust_profile(&bd_addr, TRUSTED_PROFILE_A2DP, &trusted);
 
                        if (_bt_headset_get_local_connection() == FALSE) {
-                               if (restricted == 0x0) /* not restricted*/
+                               if (trusted == TRUE) /* not restricted*/
                                        _bt_start_timer_for_connection(address, BT_AUDIO_A2DP);
                        } else
                                _bt_headset_set_local_connection(FALSE);
@@ -2376,7 +2441,6 @@ void _bt_handle_headset_event(GVariant *msg, const char *path)
                                                        wait_list->address);
                        _bt_audio_connect(wait_list->req_id, wait_list->type,
                                        &device_address, NULL);
-                       _bt_rel_wait_data();
                } else if (event == BLUETOOTH_EVENT_AG_CONNECTED) {
                        /* Add data to the connected list */
                        _bt_add_headset_to_list(BT_AUDIO_HSP,
@@ -2575,6 +2639,7 @@ void _bt_handle_agent_event(GVariant *msg, const char *member)
                _bt_send_event(BT_OPP_SERVER_EVENT,
                        BLUETOOTH_EVENT_OBEX_SERVER_CONNECTION_AUTHORIZE,
                        param);
+               /* TODO: MAP? see above */
                g_free(address);
                g_free(name);
        } else if (strcasecmp(member, "RfcommAuthorize") == 0) {
@@ -2596,6 +2661,34 @@ void _bt_handle_agent_event(GVariant *msg, const char *member)
        }
 }
 
+void _bt_handle_tds_provider_event(GVariant *msg, const char *member, const char *path)
+{
+       BT_INFO("member: %s, path: %s", member, path);
+
+       ret_if(path == NULL);
+
+       if (strcasecmp(member, "TdsActivationRequested") == 0) {
+               GVariant *value = NULL;
+               int len = 0;
+               unsigned char *buffer = NULL;
+               unsigned char org_id;
+
+               g_variant_get(msg, "(y@ay)", &org_id, &value);
+               BT_DBG("org_id: %.2x", org_id);
+               len = g_variant_get_size(value);
+               if (len > 0) {
+                       int i;
+                       buffer = (unsigned char *)g_variant_get_data(value);
+                       for (i = 0; i < len; i++)
+                               BT_DBG("%.2x", buffer[i]);
+               }
+
+               /* Send event only registered client */
+               _bt_tds_handle_activation_request(path, org_id, buffer, len);
+               g_variant_unref(value);
+       }
+}
+
 static int __bt_get_object_path(GVariant *msg, char **path)
 {
        g_variant_get(msg, "(o*)", path, NULL);
@@ -2674,29 +2767,26 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                g_variant_get(parameters, "(&o@a{sa{sv}})", &obj_path, &value);
 
                if (strcasecmp(obj_path, BT_BLUEZ_HCI_PATH) == 0) {
-#ifdef USB_BLUETOOTH
-                       BT_DBG("Enable Adapter");
-                       _bt_enable_adapter();
-#else
-                       _bt_handle_adapter_added();
-#endif
+                       if (TIZEN_FEATURE_BT_USB_DONGLE) {
+                               BT_DBG("Enable Adapter");
+                               _bt_enable_adapter();
+                       } else {
+                               _bt_handle_adapter_added();
+                       }
                } else {
                        bt_event = __bt_parse_event(value);
                        if (bt_event == BT_DEVICE_EVENT) {
                                bt_cache_info_t *cache_info;
                                bt_remote_dev_info_t *dev_info;
-
+#ifdef TIZEN_FEATURE_BT_DPM
+                               int desktop_state = DPM_BT_ERROR;
+#endif
                                ret_if(_bt_is_discovering() == FALSE &&
                                                _bt_is_le_scanning() == FALSE);
 
                                cache_info = g_malloc0(sizeof(bt_cache_info_t));
-                               ret_if(cache_info == NULL);
 
                                dev_info = g_malloc0(sizeof(bt_remote_dev_info_t));
-                               if (dev_info == NULL) {
-                                       __bt_free_cache_info(cache_info);
-                                       return;
-                               }
 
                                cache_info->dev_info = dev_info;
 
@@ -2722,9 +2812,9 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                                         */
                                        dev_info->name = g_strdup(dev_info->address);
 
-#ifdef TIZEN_DPM_ENABLE
-                               if (_bt_dpm_get_bluetooth_desktop_connectivity_state() ==
-                                                       DPM_RESTRICTED) {
+#ifdef TIZEN_FEATURE_BT_DPM
+                               _bt_dpm_get_bluetooth_desktop_connectivity_state(&desktop_state);
+                               if (desktop_state == DPM_RESTRICTED) {
                                        bluetooth_device_class_t device_class;
                                        _bt_divide_device_class(&device_class, dev_info->class);
                                        BT_DBG("[%s]device_class.major_class : %d", dev_info->name, device_class.major_class);
@@ -2776,10 +2866,10 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                }
                g_variant_unref(value);
        } else if (strcasecmp(signal_name, "InterfacesRemoved") == 0) {
-#ifdef USB_BLUETOOTH
-               BT_DBG("InterfacesRemoved");
-               _bt_handle_adapter_removed();
-#endif
+               if (TIZEN_FEATURE_BT_USB_DONGLE) {
+                       BT_DBG("InterfacesRemoved");
+                       _bt_handle_adapter_removed();
+               }
                if (g_strcmp0(interface_name, BT_MEDIATRANSPORT_INTERFACE) == 0)
                        bt_event = BT_MEDIA_TRANSFER_EVENT;
                else if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0)
@@ -2815,12 +2905,16 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                }
 
                if (strcasecmp(name, BT_BLUEZ_NAME) == 0) {
-                       BT_DBG("Bluetoothd is terminated");
-                       if (_bt_adapter_get_status() == BT_ACTIVATED)
-                                _bt_disable_cb();
-
+                       BT_INFO_C("### Bluetoothd is terminated");
+                       if (_bt_adapter_get_status() != BT_DEACTIVATING &&
+                               _bt_adapter_get_status() != BT_DEACTIVATED) {
+                               BT_INFO_C("Turn Off Bluetooth");
+                               _bt_set_le_disabled(BLUETOOTH_ERROR_NONE);
+                               _bt_disable_cb();
+                       }
                        _bt_handle_adapter_removed();
                        __bt_devices_list_free();
+                       _bt_service_adapter_le_deinit();
                }
 
                _bt_obex_server_check_allocation(&value);
@@ -2837,10 +2931,20 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                        _bt_rfcomm_server_check_termination(name);
                }
 
+               /* Reset connection interval */
+               _bt_remove_all_le_conn_param_info(name);
+
                /* Stop advertising started by terminated process */
                _bt_stop_advertising_by_terminated_process(name);
                /* Stop LE Scan */
                _bt_stop_le_scan(name);
+
+               /* Stop the Proximity reporter service */
+               _bt_proximity_reporter_stop_by_terminated_process(name);
+
+               /* Stop the Transport Discovery service */
+               _bt_tds_stop_by_terminated_process(name);
+
                g_free(name);
                g_free(previous);
                g_free(current);
@@ -2866,6 +2970,8 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                _bt_handle_agent_event(parameters, signal_name);
        } else if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0) {
                _bt_handle_device_event(parameters, signal_name, object_path);
+       } else if (g_strcmp0(interface_name, BT_TDS_PROVIDER_INTERFACE) == 0) {
+               _bt_handle_tds_provider_event(parameters, signal_name, object_path);
        } else if (g_strcmp0(interface_name, BT_GATT_CHAR_INTERFACE) == 0) {
                _bt_handle_gatt_event(parameters, signal_name, object_path);
        }
@@ -2911,6 +3017,7 @@ static  void __bt_obexd_event_filter(GDBusConnection *connection,
                BT_INFO("object_path = [%s]", obj_path);
 
                /*Handle OPP_SERVER_CONNECTED_EVENT here */
+               /* TODO: MAP? see above */
                if (strncmp(obj_path, BT_SESSION_BASEPATH_SERVER,
                                strlen(BT_SESSION_BASEPATH_SERVER)) != 0) {
                        g_free(obj_path);
@@ -2924,6 +3031,7 @@ static  void __bt_obexd_event_filter(GDBusConnection *connection,
                g_free(obj_path);
        } else if (strcasecmp(member, "InterfacesRemoved") == 0) {
                /*Handle OPP_SERVER_DISCONNECTED_EVENT here */
+               /* TODO: MAP? see above */
                if (__bt_get_object_path(parameters, &obj_path)) {
                        BT_ERR("Fail to get the path");
                        return;
@@ -3043,7 +3151,7 @@ int _bt_opp_client_event_init(void)
        GError *error = NULL;
 
        if (opc_obexd_conn == NULL) {
-               opc_obexd_conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
+               opc_obexd_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
 
                if (!opc_obexd_conn) {
                        if (error) {
@@ -3074,56 +3182,118 @@ void _bt_opp_client_event_deinit(void)
        }
 }
 
+static  void __bt_map_event_filter(GDBusConnection *connection,
+                                       const gchar *sender_name,
+                                       const gchar *object_path,
+                                       const gchar *interface_name,
+                                       const gchar *signal_name,
+                                       GVariant *parameters,
+                                       gpointer user_data)
+{
+       BT_DBG("Entered __bt_map_event_filter");
+       const char *member = signal_name;
+
+       if (strcasecmp(member, "InterfacesAdded") == 0) {
+               BT_DBG("------------------------------------ADDED------------------------------------");
+               // currently doing nothing
+       } else if (strcasecmp(member, "InterfacesRemoved") == 0) {
+               BT_DBG("------------------------------------REMOVED------------------------------------");
+               // TODO check if something should be called here?
+               //_bt_map_on_transfer_finished(object_path, error);
+       } else if (__bt_is_obexd_client_event(parameters, interface_name) == TRUE) {
+               BT_DBG("------------------------------------CLIENT EVENT------------------------------------");
+               _bt_map_property_changed_event(parameters, object_path);
+       }
+
+       return;
+}
+
+int _bt_map_client_event_init(void)
+{
+       GError *error = NULL;
+
+       if (map_obexd_conn == NULL) {
+               map_obexd_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
+
+               if (!map_obexd_conn) {
+                       if (error) {
+                               BT_ERR("Unable to connect to dbus: %s", error->message);
+                               g_clear_error(&error);
+                       }
+               return BLUETOOTH_ERROR_INTERNAL;
+               }
+       }
+
+       if (_bt_register_service_event(map_obexd_conn,
+                       BT_MAP_CLIENT_EVENT) != BLUETOOTH_ERROR_NONE) {
+                       g_object_unref(map_obexd_conn);
+                       map_obexd_conn = NULL;
+                       return BLUETOOTH_ERROR_INTERNAL;
+       }
+
+       return BLUETOOTH_ERROR_NONE;
+}
+
+void _bt_map_client_event_deinit(void)
+{
+       if (map_obexd_conn) {
+               _bt_unregister_service_event(map_obexd_conn,
+                                               BT_MAP_CLIENT_EVENT);
+                g_object_unref(map_obexd_conn);
+                map_obexd_conn = NULL;
+       }
+}
+
 int _bt_register_manager_subscribe_signal(GDBusConnection *conn,
                int subscribe)
 {
        if (conn == NULL)
                return -1;
 
-       static int subs_interface_added_id = -1;
-       static int subs_interface_removed_id = -1;
-       static int subs_name_owner_id = -1;
-       static int subs_property_id = -1;
-       static int subs_adapter_id = -1;
-       static int subs_gatt_id = -1;
+       static guint subs_interface_added_id;
+       static guint subs_interface_removed_id;
+       static guint subs_name_owner_id;
+       static guint subs_property_id;
+       static guint subs_adapter_id;
+       static guint subs_gatt_id;
 
        if (subscribe) {
-               if (subs_interface_added_id == -1) {
+               if (subs_interface_added_id == 0) {
                        subs_interface_added_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_MANAGER_INTERFACE,
                                BT_INTERFACES_ADDED, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
                }
-               if (subs_interface_removed_id == -1) {
+               if (subs_interface_removed_id == 0) {
                        subs_interface_removed_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_MANAGER_INTERFACE,
                                BT_INTERFACES_REMOVED, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
                }
-               if (subs_name_owner_id == -1) {
+               if (subs_name_owner_id == 0) {
                        subs_name_owner_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_FREEDESKTOP_INTERFACE,
                                BT_NAME_OWNER_CHANGED, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
                }
-               if (subs_property_id == -1) {
+               if (subs_property_id == 0) {
                        subs_property_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_PROPERTIES_INTERFACE,
                                BT_PROPERTIES_CHANGED, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
                }
-               if (subs_adapter_id == -1) {
+               if (subs_adapter_id == 0) {
                        subs_adapter_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_ADAPTER_INTERFACE,
                                NULL, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
                }
-               if (subs_gatt_id == -1) {
+               if (subs_gatt_id == 0) {
                        subs_gatt_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_GATT_CHAR_INTERFACE,
                                NULL, NULL, NULL, 0,
@@ -3131,33 +3301,33 @@ int _bt_register_manager_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_interface_added_id != -1) {
+               if (subs_interface_added_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_interface_added_id);
-                       subs_interface_added_id = -1;
+                       subs_interface_added_id = 0;
                }
-               if (subs_interface_removed_id != -1) {
+               if (subs_interface_removed_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_interface_removed_id);
-                       subs_interface_removed_id = -1;
+                       subs_interface_removed_id = 0;
                }
-               if (subs_name_owner_id != -1) {
+               if (subs_name_owner_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_name_owner_id);
-                       subs_name_owner_id = -1;
+                       subs_name_owner_id = 0;
                }
-               if (subs_property_id != -1) {
+               if (subs_property_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_property_id);
-                       subs_property_id = -1;
+                       subs_property_id = 0;
                }
-               if (subs_adapter_id != -1) {
+               if (subs_adapter_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn, subs_adapter_id);
-                       subs_adapter_id = -1;
+                       subs_adapter_id = 0;
                }
-               if (subs_gatt_id != -1) {
+               if (subs_gatt_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn, subs_gatt_id);
-                       subs_gatt_id = -1;
+                       subs_gatt_id = 0;
                }
        }
        return 0;
@@ -3169,10 +3339,10 @@ int _bt_register_device_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static int subs_device_id = -1;
+       static guint subs_device_id = 0;
 
        if (subscribe) {
-               if (subs_device_id == -1) {
+               if (subs_device_id == 0) {
                        subs_device_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_DEVICE_INTERFACE,
                                NULL, NULL, NULL, 0,
@@ -3180,10 +3350,10 @@ int _bt_register_device_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_device_id != -1) {
+               if (subs_device_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_device_id);
-                       subs_device_id = -1;
+                       subs_device_id = 0;
                }
        }
        return 0;
@@ -3195,10 +3365,10 @@ int _bt_register_input_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static int subs_input_id = -1;
+       static int subs_input_id = 0;
 
        if (subscribe) {
-               if (subs_input_id == -1) {
+               if (subs_input_id == 0) {
                        subs_input_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_INPUT_INTERFACE,
                                NULL, NULL, NULL, 0,
@@ -3206,10 +3376,10 @@ int _bt_register_input_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_input_id != -1) {
+               if (subs_input_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_input_id);
-                       subs_input_id = -1;
+                       subs_input_id = 0;
                }
        }
        return 0;
@@ -3221,18 +3391,18 @@ int _bt_register_network_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static int subs_serv_id = -1;
-       static int subs_client_id = -1;
+       static guint subs_serv_id = 0;
+       static guint subs_client_id = 0;
 
        if (subscribe) {
-               if (subs_serv_id == -1) {
+               if (subs_serv_id == 0) {
                        subs_serv_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_NETWORK_SERVER_INTERFACE,
                                NULL, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
                }
-               if (subs_client_id == -1) {
+               if (subs_client_id == 0) {
                        subs_client_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_NETWORK_CLIENT_INTERFACE,
                                NULL, NULL, NULL, 0,
@@ -3240,15 +3410,15 @@ int _bt_register_network_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_serv_id != -1) {
+               if (subs_serv_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_serv_id);
-                       subs_serv_id = -1;
+                       subs_serv_id = 0;
                }
-               if (subs_client_id != -1) {
+               if (subs_client_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_client_id);
-                       subs_client_id = -1;
+                       subs_client_id = 0;
                }
        }
        return 0;
@@ -3260,18 +3430,18 @@ int _bt_register_audio_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static int subs_headset_id = -1;
-       static int subs_sink_id = -1;
+       static guint subs_headset_id = 0;
+       static guint subs_sink_id = 0;
 
        if (subscribe) {
-               if (subs_headset_id == -1) {
+               if (subs_headset_id == 0) {
                        subs_headset_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_HEADSET_INTERFACE,
                                NULL, NULL, NULL, 0,
                                __bt_manager_event_filter,
                                NULL, NULL);
                }
-               if (subs_sink_id == -1) {
+               if (subs_sink_id == 0) {
                        subs_sink_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_SINK_INTERFACE,
                                NULL, NULL, NULL, 0,
@@ -3279,15 +3449,15 @@ int _bt_register_audio_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_headset_id != -1) {
+               if (subs_headset_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_headset_id);
-                       subs_headset_id = -1;
+                       subs_headset_id = 0;
                }
-               if (subs_sink_id != -1) {
+               if (subs_sink_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_sink_id);
-                       subs_sink_id = -1;
+                       subs_sink_id = 0;
                }
        }
        return 0;
@@ -3299,27 +3469,27 @@ int _bt_register_opp_server_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static int subs_opp_server_interface_added_id = -1;
-       static int subs_opp_server_interface_removed_id = -1;
-       static int subs_opp_server_property_id = -1;
+       static guint subs_opp_server_interface_added_id = 0;
+       static guint subs_opp_server_interface_removed_id = 0;
+       static guint subs_opp_server_property_id = 0;
 
 
        if (subscribe) {
-               if (subs_opp_server_interface_added_id == -1) {
+               if (subs_opp_server_interface_added_id == 0) {
                        subs_opp_server_interface_added_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_MANAGER_INTERFACE,
                                BT_INTERFACES_ADDED, NULL, NULL, 0,
                                __bt_obexd_event_filter,
                                NULL, NULL);
                }
-               if (subs_opp_server_interface_removed_id == -1) {
+               if (subs_opp_server_interface_removed_id == 0) {
                        subs_opp_server_interface_removed_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_MANAGER_INTERFACE,
                                BT_INTERFACES_REMOVED, NULL, NULL, 0,
                                __bt_obexd_event_filter,
                                NULL, NULL);
                }
-               if (subs_opp_server_property_id == -1) {
+               if (subs_opp_server_property_id == 0) {
                        subs_opp_server_property_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_PROPERTIES_INTERFACE,
                                BT_PROPERTIES_CHANGED, NULL, NULL, 0,
@@ -3327,20 +3497,20 @@ int _bt_register_opp_server_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_opp_server_interface_added_id != -1) {
+               if (subs_opp_server_interface_added_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_opp_server_interface_added_id);
-                       subs_opp_server_interface_added_id = -1;
+                       subs_opp_server_interface_added_id = 0;
                }
-               if (subs_opp_server_interface_removed_id != -1) {
+               if (subs_opp_server_interface_removed_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_opp_server_interface_removed_id);
-                       subs_opp_server_interface_removed_id = -1;
+                       subs_opp_server_interface_removed_id = 0;
                }
-               if (subs_opp_server_property_id != -1) {
+               if (subs_opp_server_property_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_opp_server_property_id);
-                       subs_opp_server_property_id = -1;
+                       subs_opp_server_property_id = 0;
                }
        }
        return 0;
@@ -3352,27 +3522,27 @@ int _bt_register_opp_client_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static int subs_opp_client_interface_added_id = -1;
-       static int subs_opp_client_interface_removed_id = -1;
-       static int subs_opp_client_property_id = -1;
+       static guint subs_opp_client_interface_added_id = 0;
+       static guint subs_opp_client_interface_removed_id = 0;
+       static guint subs_opp_client_property_id = 0;
 
 
        if (subscribe) {
-               if (subs_opp_client_interface_added_id == -1) {
+               if (subs_opp_client_interface_added_id == 0) {
                        subs_opp_client_interface_added_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_MANAGER_INTERFACE,
                                BT_INTERFACES_ADDED, NULL, NULL, 0,
                                __bt_opc_event_filter,
                                NULL, NULL);
                }
-               if (subs_opp_client_interface_removed_id == -1) {
+               if (subs_opp_client_interface_removed_id == 0) {
                        subs_opp_client_interface_removed_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_MANAGER_INTERFACE,
                                BT_INTERFACES_REMOVED, NULL, NULL, 0,
                                __bt_opc_event_filter,
                                NULL, NULL);
                }
-               if (subs_opp_client_property_id == -1) {
+               if (subs_opp_client_property_id == 0) {
                        subs_opp_client_property_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_PROPERTIES_INTERFACE,
                                BT_PROPERTIES_CHANGED, NULL, NULL, 0,
@@ -3380,20 +3550,73 @@ int _bt_register_opp_client_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_opp_client_interface_added_id != -1) {
+               if (subs_opp_client_interface_added_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_opp_client_interface_added_id);
-                       subs_opp_client_interface_added_id = -1;
+                       subs_opp_client_interface_added_id = 0;
                }
-               if (subs_opp_client_interface_removed_id != -1) {
+               if (subs_opp_client_interface_removed_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_opp_client_interface_removed_id);
-                       subs_opp_client_interface_removed_id = -1;
+                       subs_opp_client_interface_removed_id = 0;
                }
-               if (subs_opp_client_property_id != -1) {
+               if (subs_opp_client_property_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_opp_client_property_id);
-                       subs_opp_client_property_id = -1;
+                       subs_opp_client_property_id = 0;
+               }
+       }
+       return 0;
+}
+
+int _bt_register_map_client_subscribe_signal(GDBusConnection *conn,
+               int subscribe)
+{
+       if (conn == NULL)
+               return -1;
+
+       static guint subs_map_client_interface_added_id = 0;
+       static guint subs_map_client_interface_removed_id = 0;
+       static guint subs_map_client_property_id = 0;
+
+
+       if (subscribe) {
+               if (subs_map_client_interface_added_id == 0) {
+                       subs_map_client_interface_added_id = g_dbus_connection_signal_subscribe(conn,
+                               NULL, BT_MANAGER_INTERFACE,
+                               BT_INTERFACES_ADDED, NULL, NULL, 0,
+                               __bt_map_event_filter,
+                               NULL, NULL);
+               }
+               if (subs_map_client_interface_removed_id == 0) {
+                       subs_map_client_interface_removed_id = g_dbus_connection_signal_subscribe(conn,
+                               NULL, BT_MANAGER_INTERFACE,
+                               BT_INTERFACES_REMOVED, NULL, NULL, 0,
+                               __bt_map_event_filter,
+                               NULL, NULL);
+               }
+               if (subs_map_client_property_id == 0) {
+                       subs_map_client_property_id = g_dbus_connection_signal_subscribe(conn,
+                               NULL, BT_PROPERTIES_INTERFACE,
+                               BT_PROPERTIES_CHANGED, NULL, NULL, 0,
+                               __bt_map_event_filter,
+                               NULL, NULL);
+               }
+       } else {
+               if (subs_map_client_interface_added_id > 0) {
+                       g_dbus_connection_signal_unsubscribe(conn,
+                                       subs_map_client_interface_added_id);
+                       subs_map_client_interface_added_id = 0;
+               }
+               if (subs_map_client_interface_removed_id > 0) {
+                       g_dbus_connection_signal_unsubscribe(conn,
+                                       subs_map_client_interface_removed_id);
+                       subs_map_client_interface_removed_id = 0;
+               }
+               if (subs_map_client_property_id > 0) {
+                       g_dbus_connection_signal_unsubscribe(conn,
+                                       subs_map_client_property_id);
+                       subs_map_client_property_id = 0;
                }
        }
        return 0;
@@ -3405,18 +3628,18 @@ int _bt_register_a2dp_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static int subs_a2dp_source_id = -1;
-       static int subs_a2dp_sink_id = -1;
+       static guint subs_a2dp_source_id = 0;
+       static guint subs_a2dp_sink_id = 0;
 
        if (subscribe) {
-               if (subs_a2dp_source_id == -1) {
+               if (subs_a2dp_source_id == 0) {
                        subs_a2dp_source_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_A2DP_SOURCE_INTERFACE,
                                NULL, NULL, NULL, 0,
                                __bt_opc_event_filter,
                                NULL, NULL);
                }
-               if (subs_a2dp_sink_id == -1) {
+               if (subs_a2dp_sink_id == 0) {
                        subs_a2dp_sink_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_SINK_INTERFACE,
                                NULL, NULL, NULL, 0,
@@ -3424,17 +3647,43 @@ int _bt_register_a2dp_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_a2dp_source_id != -1) {
+               if (subs_a2dp_source_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_a2dp_source_id);
-                       subs_a2dp_source_id = -1;
+                       subs_a2dp_source_id = 0;
                }
-               if (subs_a2dp_sink_id != -1) {
+               if (subs_a2dp_sink_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_a2dp_sink_id);
-                       subs_a2dp_sink_id = -1;
+                       subs_a2dp_sink_id = 0;
+               }
+       }
+       return 0;
+}
+
+int _bt_register_tds_provider_subscribe_signal(GDBusConnection *conn, int subscribe)
+{
+       if (conn == NULL)
+               return -1;
+
+       static guint subs_custom_id = 0;
+
+       if (subscribe) {
+               if (subs_custom_id == 0) {
+                       subs_custom_id = g_dbus_connection_signal_subscribe(conn,
+                               NULL, BT_TDS_PROVIDER_INTERFACE,
+                               NULL, NULL, NULL, 0,
+                               __bt_manager_event_filter,
+                               NULL, NULL);
+               }
+       } else {
+               if (subs_custom_id > 0) {
+                       g_dbus_connection_signal_unsubscribe(conn,
+                                       subs_custom_id);
+                       subs_custom_id = 0;
                }
        }
+
        return 0;
 }
 
@@ -3455,10 +3704,10 @@ int __bt_register_dump_subscribe_signal(GDBusConnection *conn,
        if (conn == NULL)
                return -1;
 
-       static int subs_source_id = -1;
+       static guint subs_source_id = 0;
 
        if (subscribe) {
-               if (subs_source_id == -1) {
+               if (subs_source_id == 0) {
                        subs_source_id = g_dbus_connection_signal_subscribe(conn,
                                NULL, BT_DUMP_SERVICE_INTERFACE,
                                BT_DUMP_SERVICE_SIGNAL, BT_DUMP_SERVICE_PATH, NULL, 0,
@@ -3466,10 +3715,10 @@ int __bt_register_dump_subscribe_signal(GDBusConnection *conn,
                                NULL, NULL);
                }
        } else {
-               if (subs_source_id != -1) {
+               if (subs_source_id > 0) {
                        g_dbus_connection_signal_unsubscribe(conn,
                                        subs_source_id);
-                       subs_source_id = -1;
+                       subs_source_id = 0;
                }
        }
        return 0;
@@ -3497,19 +3746,27 @@ int _bt_register_service_event(GDBusConnection *g_conn, int event_type)
        case BT_HEADSET_EVENT:
                _bt_register_audio_subscribe_signal(g_conn, TRUE);
                break;
-
        case BT_OPP_SERVER_EVENT:
                BT_ERR("BT_OPP_SERVER_EVENT: register service event");
                _bt_register_opp_server_subscribe_signal(g_conn, TRUE);
                break;
+
        case BT_OPP_CLIENT_EVENT:
                BT_ERR("BT_OPP_CLIENT_EVENT: register service event");
                _bt_register_opp_client_subscribe_signal(g_conn, TRUE);
                break;
+       case BT_MAP_CLIENT_EVENT:
+               BT_ERR("BT_MAP_CLIENT_EVENT: register service event");
+               _bt_register_map_client_subscribe_signal(g_conn, TRUE);
+               break;
        case BT_A2DP_SOURCE_EVENT:
                BT_INFO("A2dp Source event");
                _bt_register_a2dp_subscribe_signal(g_conn, TRUE);
                break;
+       case BT_TDS_EVENT:
+               BT_INFO("TDS provider event");
+               _bt_register_tds_provider_subscribe_signal(g_conn, TRUE);
+               break;
        default:
                BT_ERR("Unknown event");
                return BLUETOOTH_ERROR_INTERNAL;
@@ -3538,6 +3795,9 @@ void _bt_unregister_service_event(GDBusConnection *g_conn, int event_type)
        case BT_OPP_CLIENT_EVENT:
                _bt_register_opp_client_subscribe_signal(g_conn, FALSE);
                break;
+       case BT_MAP_CLIENT_EVENT:
+               _bt_register_map_client_subscribe_signal(g_conn, FALSE);
+               break;
        default:
                BT_ERR("Unknown event");
                return;
@@ -3580,6 +3840,10 @@ static int __bt_init_manager_receiver(void)
                                BT_NETWORK_EVENT) != BLUETOOTH_ERROR_NONE)
                goto fail;
 
+       if (_bt_register_service_event(manager_conn,
+                               BT_TDS_EVENT) != BLUETOOTH_ERROR_NONE)
+               goto fail;
+
        __bt_register_dump_subscribe_signal(manager_conn, TRUE);
        return BLUETOOTH_ERROR_NONE;
 fail:
@@ -3596,26 +3860,26 @@ fail:
 static int __bt_init_obexd_receiver(void)
 {
        BT_DBG("+");
-#ifndef TIZEN_TV /* TODO: obexd doesn't work in TV profile. It should be resolved later. */
-       GError *error = NULL;
+       if (!TIZEN_PROFILE_TV) { /* TODO: obexd doesn't work in TV profile. It should be resolved later. */
+               GError *error = NULL;
 
-       if (obexd_conn == NULL) {
-               obexd_conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);
-               if (error != NULL) {
-                       BT_ERR("ERROR: Can't get on session bus [%s]", error->message);
-                       g_clear_error(&error);
+               if (obexd_conn == NULL) {
+                       obexd_conn = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
+                       if (error != NULL) {
+                               BT_ERR("ERROR: Can't get on session bus [%s]", error->message);
+                               g_clear_error(&error);
+                       }
+                       retv_if(obexd_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
                }
-               retv_if(obexd_conn == NULL, BLUETOOTH_ERROR_INTERNAL);
-       }
 
-       if (_bt_register_service_event(obexd_conn,
-                               BT_OPP_SERVER_EVENT) != BLUETOOTH_ERROR_NONE) {
-               BT_ERR("Error while registering service event");
-               g_object_unref(obexd_conn);
-               obexd_conn = NULL;
-               return BLUETOOTH_ERROR_INTERNAL;
+               if (_bt_register_service_event(obexd_conn,
+                                       BT_OPP_SERVER_EVENT) != BLUETOOTH_ERROR_NONE) {
+                       BT_ERR("Error while registering service event");
+                       g_object_unref(obexd_conn);
+                       obexd_conn = NULL;
+                       return BLUETOOTH_ERROR_INTERNAL;
+               }
        }
-#endif
        BT_DBG("-");
 
        return BLUETOOTH_ERROR_NONE;
@@ -3702,6 +3966,10 @@ void _bt_deinit_service_event_receiver(void)
                g_source_remove(event_id);
        event_id = 0;
 
+       if (le_scan_event_id > 0)
+               g_source_remove(le_scan_event_id);
+       le_scan_event_id = 0;
+
        BT_DBG("-");
 }