Add missed code for the discovery state logic
[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-adapter.c
index 9b2f480..569afe2 100644 (file)
 #include <dlog.h>
 #include <string.h>
 #include <vconf.h>
-#if !defined(LIBNOTIFY_SUPPORT) && !defined(LIBNOTIFICATION_SUPPORT)
 #include <syspopup_caller.h>
-#endif
-#include <aul.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
 #include <bundle.h>
 #include <eventsystem.h>
 #include <bundle_internal.h>
 #include "bt-service-util.h"
 #include "bt-service-network.h"
 #include "bt-service-obex-server.h"
+#include "bt-service-opp-client.h"
+#include "bt-service-map-client.h"
 #include "bt-service-agent.h"
 #include "bt-service-main.h"
 #include "bt-service-avrcp.h"
 #include "bt-service-device.h"
-#ifdef TIZEN_DPM_ENABLE
+#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-service-dpm.h"
 #endif
 
@@ -52,20 +49,35 @@ typedef struct {
        guint event_id;
        int timeout;
        time_t start_time;
-       gboolean alarm_init;
        int alarm_id;
 } bt_adapter_timer_t;
 
 bt_adapter_timer_t visible_timer = {0, };
 
+typedef struct {
+       alarm_id_t alarm_id;
+       bt_set_alarm_cb callback;
+       void *user_data;
+} bt_service_alarm_t;
+
+typedef struct {
+       gboolean is_alarm_initialized;
+       GList *g_alarm_list;
+} bt_service_alarm_mgr_t;
+
+static bt_service_alarm_mgr_t alarm_mgr = {0, };
+
 static gboolean is_discovering;
+static gboolean discovery_req;
 static gboolean cancel_by_user;
 static bt_status_t adapter_status = BT_DEACTIVATED;
 static bt_le_status_t adapter_le_status = BT_LE_DEACTIVATED;
+static gboolean is_le_intended = FALSE;
 static void *adapter_agent = NULL;
 static GDBusProxy *core_proxy = NULL;
 static guint timer_id = 0;
 static guint le_timer_id = 0;
+static gboolean is_recovery_mode;
 
 static uint status_reg_id;
 
@@ -75,12 +87,15 @@ static uint status_reg_id;
 
 #define BT_DISABLE_TIME 500 /* 500 ms */
 
+static int alarm_cb(alarm_id_t alarm_id, void* user_param);
+static void alarm_data_free(void *data);
+
 GDBusProxy *_bt_init_core_proxy(void)
 {
        GDBusProxy *proxy;
        GDBusConnection *conn;
 
-       conn = _bt_get_system_gconn();
+       conn = _bt_gdbus_get_system_gconn();
        if (!conn)
                return NULL;
 
@@ -101,19 +116,17 @@ GDBusProxy *_bt_init_core_proxy(void)
 
 static GDBusProxy *__bt_get_core_proxy(void)
 {
-       return (core_proxy) ? core_proxy : _bt_init_core_proxy();
+       return (core_proxy) ? core_proxy : _bt_init_core_proxy();
 }
 
 static gboolean __bt_is_factory_test_mode(void)
 {
        int mode = 0;
 
-#ifdef ENABLE_TIZEN_2_4
        if (vconf_get_bool(VCONFKEY_BT_DUT_MODE, &mode)) {
                BT_ERR("Get the DUT Mode fail");
                return TRUE;
        }
-#endif
 
        if (mode != FALSE) {
                BT_INFO("DUT Test Mode !!");
@@ -143,10 +156,10 @@ static gboolean __bt_timeout_handler(gpointer user_data)
                visible_timer.event_id = 0;
                visible_timer.timeout = 0;
 
-#ifndef TIZEN_WEARABLE
-               if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0)
-                       BT_ERR("Set vconf failed\n");
-#endif
+               if (!TIZEN_PROFILE_WEARABLE) {
+                       if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0)
+                               BT_ERR("Set vconf failed\n");
+               }
                return FALSE;
        }
 
@@ -155,7 +168,6 @@ static gboolean __bt_timeout_handler(gpointer user_data)
 
 static int __bt_visibility_alarm_cb(alarm_id_t alarm_id, void* user_param)
 {
-       BT_DBG("__bt_visibility_alarm_cb - alram id = [%d] \n", alarm_id);
 
        int result = BLUETOOTH_ERROR_NONE;
        int timeout = 0;
@@ -171,10 +183,10 @@ static int __bt_visibility_alarm_cb(alarm_id_t alarm_id, void* user_param)
                visible_timer.event_id = 0;
                visible_timer.timeout = 0;
 
-#ifndef TIZEN_WEARABLE
-               if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0)
-                       BT_ERR("Set vconf failed\n");
-#endif
+               if (!TIZEN_PROFILE_WEARABLE) {
+                       if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0)
+                               BT_ERR("Set vconf failed\n");
+               }
        }
        /* Switch Off visibility in Bluez */
        _bt_set_discoverable_mode(BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE, 0);
@@ -182,21 +194,6 @@ static int __bt_visibility_alarm_cb(alarm_id_t alarm_id, void* user_param)
        return 0;
 }
 
-static void __bt_visibility_alarm_create()
-{
-       alarm_id_t alarm_id;
-       int result;
-
-       result = alarmmgr_add_alarm(ALARM_TYPE_VOLATILE, visible_timer.timeout,
-                                               0, NULL, &alarm_id);
-       if (result < 0) {
-               BT_ERR("Failed to create alarm error = %d\n", result);
-       } else {
-               BT_DBG("Alarm created = %d\n", alarm_id);
-               visible_timer.alarm_id = alarm_id;
-       }
-}
-
 static void __bt_visibility_alarm_remove()
 {
        if (visible_timer.event_id > 0) {
@@ -205,7 +202,7 @@ static void __bt_visibility_alarm_remove()
        }
 
        if (visible_timer.alarm_id > 0) {
-               alarmmgr_remove_alarm(visible_timer.alarm_id);
+               _bt_service_remove_alarm(visible_timer.alarm_id);
                visible_timer.alarm_id = 0;
        }
 }
@@ -213,45 +210,41 @@ static void __bt_visibility_alarm_remove()
 int __bt_set_visible_time(int timeout)
 {
        int result;
+       alarm_id_t alarm_id;
+#ifdef TIZEN_FEATURE_BT_DPM
+       int discoverable_state = DPM_BT_ERROR;
+#endif
 
        __bt_visibility_alarm_remove();
 
        visible_timer.timeout = timeout;
 
-#ifndef TIZEN_WEARABLE
-#ifdef TIZEN_DPM_ENABLE
-       if (_bt_dpm_get_bluetooth_limited_discoverable_state() != DPM_RESTRICTED) {
-#endif
-       if (vconf_set_int(BT_FILE_VISIBLE_TIME, timeout) != 0)
-               BT_ERR("Set vconf failed");
-#ifdef TIZEN_DPM_ENABLE
-       }
+       if (!TIZEN_PROFILE_WEARABLE) {
+#ifdef TIZEN_FEATURE_BT_DPM
+               _bt_dpm_get_bluetooth_limited_discoverable_state(&discoverable_state);
+               if (discoverable_state != DPM_RESTRICTED) {
 #endif
+               if (vconf_set_int(BT_FILE_VISIBLE_TIME, timeout) != 0)
+                       BT_ERR("Set vconf failed");
+#ifdef TIZEN_FEATURE_BT_DPM
+               }
 #endif
+       }
+
 
        if (timeout <= 0)
                return BLUETOOTH_ERROR_NONE;
 
-       if (!visible_timer.alarm_init) {
-               /* Set Alarm timer to switch off BT */
-               result = alarmmgr_init("bt-service");
-               if (result != 0)
-                       return BLUETOOTH_ERROR_INTERNAL;
-
-               visible_timer.alarm_init = TRUE;
-       }
-
-       result = alarmmgr_set_cb(__bt_visibility_alarm_cb, NULL);
-       if (result != 0)
+       result = _bt_service_set_alarm(visible_timer.timeout,
+                                               __bt_visibility_alarm_cb, NULL, &alarm_id);
+       if (result != BLUETOOTH_ERROR_NONE)
                return BLUETOOTH_ERROR_INTERNAL;
-
+       visible_timer.alarm_id = alarm_id;
        /* Take start time */
        time(&(visible_timer.start_time));
        visible_timer.event_id = g_timeout_add_seconds(1,
                                __bt_timeout_handler, NULL);
 
-       __bt_visibility_alarm_create();
-
        return BLUETOOTH_ERROR_NONE;
 }
 
@@ -311,7 +304,7 @@ static int __bt_get_bonded_device_info(gchar *device_path,
        BT_CHECK_PARAMETER(device_path, return);
        BT_CHECK_PARAMETER(dev_info, return);
 
-       conn = _bt_get_system_gconn();
+       conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        device_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
@@ -370,7 +363,6 @@ static int __bt_get_bonded_device_info(gchar *device_path,
                } else if (!g_strcmp0(key, "ManufacturerData")) {
                        manufacturer_data = g_byte_array_new();
                        g_variant_get(value, "ay", &char_value_iter);
-
                        while (g_variant_iter_loop(char_value_iter, "y",  &char_value))
                                g_byte_array_append(manufacturer_data, &char_value, 1);
 
@@ -382,6 +374,7 @@ static int __bt_get_bonded_device_info(gchar *device_path,
                                                manufacturer_data->len);
                                }
                        }
+                       g_byte_array_free(manufacturer_data, TRUE);
                }
        }
        g_variant_iter_free(property_iter);
@@ -418,6 +411,7 @@ static int __bt_get_bonded_device_info(gchar *device_path,
 void _bt_set_discovery_status(gboolean mode)
 {
        is_discovering = mode;
+       discovery_req = FALSE;
 }
 
 void _bt_set_cancel_by_user(gboolean value)
@@ -452,6 +446,12 @@ bt_le_status_t _bt_adapter_get_le_status(void)
        return adapter_le_status;
 }
 
+
+void _bt_set_le_intended_status(gboolean value)
+{
+       is_le_intended = value;
+}
+
 static void __bt_phone_name_changed_cb(keynode_t *node, void *data)
 {
        char *phone_name = NULL;
@@ -464,83 +464,50 @@ static void __bt_phone_name_changed_cb(keynode_t *node, void *data)
                phone_name = vconf_keynode_get_str(node);
 
                if (phone_name && strlen(phone_name) != 0) {
-                        if (!g_utf8_validate(phone_name, -1,
+                       if (!g_utf8_validate(phone_name, -1,
                                                        (const char **)&ptr))
-                                *ptr = '\0';
+                                       *ptr = '\0';
 
                        _bt_set_local_name(phone_name);
                }
        }
 }
 
-#ifdef TIZEN_MOBILE
-static void __bt_set_visible_mode(void)
-{
-       int timeout = 0;
-
-       if (vconf_get_int(BT_FILE_VISIBLE_TIME, &timeout) != 0)
-                BT_ERR("Fail to get the timeout value");
-
-#ifdef TIZEN_DPM_ENABLE
-       if (timeout == -1 ||
-       _bt_dpm_get_bluetooth_limited_discoverable_state() == DPM_RESTRICTED) {
-               if (_bt_set_discoverable_mode(
-                       BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE,
-                       timeout) != BLUETOOTH_ERROR_NONE) {
-                       if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0)
-                               BT_ERR("Set vconf failed");
-               }
-       } else {
-               if (_bt_set_discoverable_mode(
-                       BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE,
-                       timeout) != BLUETOOTH_ERROR_NONE) {
-                               BT_ERR("Set connectable mode failed");
-               }
-       }
-#else
-       if (timeout == -1) {
-               if (_bt_set_discoverable_mode(
-                       BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE,
-                       timeout) != BLUETOOTH_ERROR_NONE) {
-                       if (vconf_set_int(BT_FILE_VISIBLE_TIME, 0) != 0)
-                               BT_ERR("Set vconf failed");
-               }
-       } else {
-               if (_bt_set_discoverable_mode(
-                       BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE,
-                       timeout) != BLUETOOTH_ERROR_NONE) {
-                               BT_ERR("Set connectable mode failed");
-               }
-       }
-#endif
-}
-#endif
-
 static void __bt_set_local_name(void)
 {
+       bluetooth_device_name_t local_name;
        char *phone_name = NULL;
        char *ptr = NULL;
+       char *temp = NULL;
 
-       phone_name = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
+       if (_bt_get_local_name(&local_name) != BLUETOOTH_ERROR_NONE ||
+               (temp = strstr(local_name.name, "BlueZ")) != NULL) {
+               phone_name = vconf_get_str(VCONFKEY_SETAPPL_DEVICE_NAME_STR);
 
-       if (!phone_name)
-               return;
+               if (!phone_name)
+                       return;
 
-       if (strlen(phone_name) != 0) {
-               if (!g_utf8_validate(phone_name, -1, (const char **)&ptr))
-                       *ptr = '\0';
+               if (strlen(phone_name) != 0) {
+                       if (!g_utf8_validate(phone_name, -1, (const char **)&ptr))
+                               *ptr = '\0';
 
-               _bt_set_local_name(phone_name);
+                       _bt_set_local_name(phone_name);
+               }
+               free(phone_name);
        }
-       free(phone_name);
 }
 
 static int __bt_set_enabled(void)
 {
-       BT_DBG("+");
        int adapter_status = BT_ADAPTER_DISABLED;
        int result = BLUETOOTH_ERROR_NONE;
 
+       if (timer_id > 0) {
+               BT_DBG("g_source is removed");
+               g_source_remove(timer_id);
+               timer_id = 0;
+       }
+
        _bt_check_adapter(&adapter_status);
 
        if (adapter_status == BT_ADAPTER_DISABLED) {
@@ -548,16 +515,16 @@ static int __bt_set_enabled(void)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-#ifdef TIZEN_MOBILE
-       __bt_set_visible_mode();
-#else
-#ifdef TIZEN_TV
-       if (_bt_set_discoverable_mode(
-               BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE, 0) != BLUETOOTH_ERROR_NONE)
-                       BT_ERR("Fail to set discoverable mode");
-#endif
-#endif
-       __bt_set_local_name();
+       if (TIZEN_PROFILE_MOBILE || TIZEN_PROFILE_IVI) {
+               /* BT setting UI will control Mobile's visible mode. So in the FRWK...set the visible mode as off: */
+               if (_bt_set_discoverable_mode(
+                       BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE, 0) != BLUETOOTH_ERROR_NONE)
+                               BT_ERR("Set connectable mode failed");
+       } else if (TIZEN_PROFILE_TV) {
+               if (_bt_set_discoverable_mode(
+                       BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE, 0) != BLUETOOTH_ERROR_NONE)
+                               BT_ERR("Fail to set discoverable mode");
+       }
 
        /* Update Bluetooth Status to notify other modules */
        if (vconf_set_int(VCONFKEY_BT_STATUS, VCONFKEY_BT_STATUS_ON) != 0)
@@ -565,16 +532,21 @@ static int __bt_set_enabled(void)
 
        if (vconf_set_int(VCONFKEY_BT_DEVICE, VCONFKEY_BT_DEVICE_NONE) != 0)
                BT_ERR("Set vconf failed\n");
-#if 0
+
        if (_bt_eventsystem_set_value(SYS_EVENT_BT_STATE, EVT_KEY_BT_STATE,
                                                EVT_VAL_BT_ON) != ES_R_OK)
                BT_ERR("Fail to set value");
-#endif
 
        /* Send enabled event to API */
        _bt_send_event(BT_ADAPTER_EVENT, BLUETOOTH_EVENT_ENABLED,
                                g_variant_new("(i)", result));
-       BT_DBG("-");
+
+#ifdef TIZEN_BT_A2DP_SINK_AUTO_CONNECT
+       _bt_audio_start_auto_connect(FALSE);
+#endif
+
+       __bt_set_local_name();
+       _bt_set_discovery_status(FALSE);
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -613,9 +585,12 @@ void _bt_set_disabled(int result)
        if (vconf_set_int(VCONFKEY_BT_DEVICE, VCONFKEY_BT_DEVICE_NONE) != 0)
                BT_ERR("Set vconf failed\n");
 
+       _bt_cancel_queued_transfers();
        _bt_adapter_set_status(BT_DEACTIVATED);
+       _bt_set_discovery_status(FALSE);
 
-       if (_bt_adapter_get_le_status() != BT_LE_DEACTIVATED) {
+       if (TIZEN_FEATURE_BT_USB_DONGLE ||
+           _bt_adapter_get_le_status() != BT_LE_DEACTIVATED) {
                /* Send disabled event */
                _bt_send_event(BT_ADAPTER_EVENT, BLUETOOTH_EVENT_DISABLED,
                                g_variant_new("(i)", result));
@@ -630,8 +605,6 @@ static int __bt_set_le_enabled(void)
        int result = BLUETOOTH_ERROR_NONE;
        bt_status_t status;
 
-       __bt_set_local_name();
-
        /* Update Bluetooth Status to notify other modules */
        if (vconf_set_int(VCONFKEY_BT_LE_STATUS, VCONFKEY_BT_LE_STATUS_ON) != 0)
                BT_ERR("Set vconf failed\n");
@@ -659,6 +632,8 @@ static int __bt_set_le_enabled(void)
        _bt_send_event(BT_LE_ADAPTER_EVENT, BLUETOOTH_EVENT_LE_ENABLED,
                                g_variant_new("(i)", result));
 
+       __bt_set_local_name();
+
        BT_DBG("-");
        return BLUETOOTH_ERROR_NONE;
 }
@@ -684,7 +659,7 @@ void _bt_set_le_disabled(int result)
 
        /* Send disabled event */
        _bt_send_event(BT_LE_ADAPTER_EVENT, BLUETOOTH_EVENT_LE_DISABLED,
-                       g_variant_new_int32(result));
+                       g_variant_new("(i)", result));
 }
 
 void *_bt_get_adapter_agent(void)
@@ -723,7 +698,6 @@ int _bt_enable_core(void)
        return BLUETOOTH_ERROR_NONE;
 }
 
-#if defined(TIZEN_BT_FLIGHTMODE_ENABLED) || (!defined(TIZEN_WEARABLE) && defined(ENABLE_TIZEN_2_4))
 static void __bt_service_flight_ps_mode_cb(keynode_t *node, void *data)
 {
        gboolean flight_mode = FALSE;
@@ -751,58 +725,52 @@ static void __bt_service_flight_ps_mode_cb(keynode_t *node, void *data)
 
        _bt_enable_core();
 }
-#endif
 
 void _bt_service_register_vconf_handler(void)
 {
        BT_DBG("+");
 
-#ifdef TIZEN_BT_FLIGHTMODE_ENABLED
-       if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
-                       (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0)
-               BT_ERR("Unable to register key handler");
-#else
-       BT_DBG("Telephony is disabled");
-#endif
+       if (TIZEN_FEATURE_FLIGHTMODE_ENABLED) {
+               if (vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
+                               (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0)
+                       BT_ERR("Unable to register key handler");
+       } else {
+               BT_DBG("Telephony is disabled");
+       }
 
-#ifndef TIZEN_WEARABLE
-#ifdef ENABLE_TIZEN_2_4
-       if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE,
-                       (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0)
-               BT_ERR("Unable to register key handler");
-#endif
-#endif
+       if (!TIZEN_PROFILE_WEARABLE) {
+               if (vconf_notify_key_changed(VCONFKEY_SETAPPL_PSMODE,
+                               (vconf_callback_fn)__bt_service_flight_ps_mode_cb, NULL) < 0)
+                       BT_ERR("Unable to register key handler");
+       }
 }
 
 void _bt_service_unregister_vconf_handler(void)
 {
        BT_DBG("+");
 
-#ifdef TIZEN_BT_FLIGHTMODE_ENABLED
-       vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
-                       (vconf_callback_fn)__bt_service_flight_ps_mode_cb);
-#endif
+       if (TIZEN_FEATURE_FLIGHTMODE_ENABLED) {
+               vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
+                               (vconf_callback_fn)__bt_service_flight_ps_mode_cb);
+       }
 
-#ifndef TIZEN_WEARABLE
-#ifdef ENABLE_TIZEN_2_4
-       vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE,
-                       (vconf_callback_fn)__bt_service_flight_ps_mode_cb);
-#endif
-#endif
+       if (!TIZEN_PROFILE_WEARABLE) {
+               vconf_ignore_key_changed(VCONFKEY_SETAPPL_PSMODE,
+                               (vconf_callback_fn)__bt_service_flight_ps_mode_cb);
+       }
 }
 
 static void __bt_state_event_handler(const char *event_name, bundle *data, void *user_data)
 {
-#ifdef ENABLE_TIZEN_2_4
        const char *bt_status = NULL;
        const char *bt_le_status = NULL;
        BT_DBG("bt state set event(%s) received", event_name);
+
        bt_status = bundle_get_val(data, EVT_KEY_BT_STATE);
        BT_DBG("bt_state: (%s)", bt_status);
 
        bt_le_status = bundle_get_val(data, EVT_KEY_BT_LE_STATE);
        BT_DBG("bt_state: (%s)", bt_le_status);
-#endif
 }
 
 void _bt_handle_adapter_added(void)
@@ -811,22 +779,33 @@ void _bt_handle_adapter_added(void)
        bt_status_t status;
        bt_le_status_t le_status;
        int ret;
-
+/*
        if (timer_id > 0) {
                BT_DBG("g_source is removed");
                g_source_remove(timer_id);
                timer_id = 0;
        }
+*/
 
        status = _bt_adapter_get_status();
        le_status = _bt_adapter_get_le_status();
        BT_DBG("status : %d", status);
        BT_DBG("le_status : %d", le_status);
 
-       adapter_agent = _bt_create_agent(BT_ADAPTER_AGENT_PATH, TRUE);
-       if (!adapter_agent) {
-               BT_ERR("Fail to register agent");
-               return;
+       if (!TIZEN_FEATURE_BT_USB_DONGLE) {
+               adapter_agent = _bt_create_agent(BT_ADAPTER_AGENT_PATH, TRUE);
+               if (!adapter_agent) {
+                       BT_ERR("Fail to register agent");
+                       return;
+               }
+       } else {
+               if (adapter_agent == NULL) {
+                       adapter_agent = _bt_create_agent(BT_ADAPTER_AGENT_PATH, TRUE);
+                       if (!adapter_agent) {
+                               BT_ERR("Fail to register agent");
+                               return;
+                       }
+               }
        }
 
        if (_bt_register_media_player() != BLUETOOTH_ERROR_NONE)
@@ -835,7 +814,7 @@ void _bt_handle_adapter_added(void)
        if (_bt_register_obex_server() != BLUETOOTH_ERROR_NONE)
                BT_ERR("Fail to init obex server");
 
-#ifdef TIZEN_BT_PAN_NAP_ENABLE
+#ifdef TIZEN_BT_PAN_NAP_ENABLED
        if (_bt_network_activate() != BLUETOOTH_ERROR_NONE)
                BT_ERR("Fail to activate network");
 #endif
@@ -856,11 +835,6 @@ void _bt_handle_adapter_added(void)
                __bt_set_enabled();
                _bt_adapter_set_status(BT_ACTIVATED);
        }
-#ifdef ENABLE_TIZEN_2_4
-       journal_bt_on();
-#endif
-
-       _bt_service_register_vconf_handler();
 
        /* eventsystem */
        if (eventsystem_register_event(SYS_EVENT_BT_STATE, &status_reg_id,
@@ -874,32 +848,56 @@ void _bt_handle_adapter_removed(void)
        int ret;
 
        _bt_adapter_set_status(BT_DEACTIVATED);
-#ifdef ENABLE_TIZEN_2_4
-       journal_bt_off();
-#endif
 
        __bt_visibility_alarm_remove();
 
-       if (visible_timer.alarm_init) {
+       if (alarm_mgr.is_alarm_initialized == TRUE) {
                alarmmgr_fini();
-               visible_timer.alarm_init = FALSE;
+               alarm_mgr.is_alarm_initialized = FALSE;
+               g_list_free_full(alarm_mgr.g_alarm_list, alarm_data_free);
+               alarm_mgr.g_alarm_list = NULL;
        }
 
+#ifdef TIZEN_BT_A2DP_SINK_AUTO_CONNECT
+       _bt_audio_stop_auto_connect();
+#endif
+
        ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_DEVICE_NAME_STR,
                                (vconf_callback_fn)__bt_phone_name_changed_cb);
-       if (0 != ret) {
+       if (0 != ret)
                ERR("vconf_ignore_key_changed failed\n");
-       }
 
-       _bt_destroy_agent(adapter_agent);
-       adapter_agent = NULL;
+/* unregister all the services/servers/profiles registered on bluez-adapter
+    once adapter is removed, reinitializing of the state-varaibles becomes
+    a problem */
+       if (_bt_unregister_obex_server() != BLUETOOTH_ERROR_NONE)
+               BT_ERR("Fail to unregister obex server");
 
-       _bt_reliable_terminate_service(NULL);
+       if (_bt_unregister_media_player() != BLUETOOTH_ERROR_NONE)
+               BT_ERR("Fail to unregister media player");
 
-       if (eventsystem_unregister_event(status_reg_id) != ES_R_OK) {
-               BT_ERR("Fail to unregister system event");
+/* Other unregister APIs should be placed here */
+
+       if (!TIZEN_FEATURE_BT_USB_DONGLE) {
+               _bt_destroy_agent(adapter_agent);
+               adapter_agent = NULL;
+
+               if (is_recovery_mode == TRUE) {
+                       /* Send disabled event */
+                       _bt_set_disabled(BLUETOOTH_ERROR_NONE);
+
+                       /* Will recover BT by bt-core, so set the mode as activating */
+                       _bt_adapter_set_status(BT_ACTIVATING);
+                       is_recovery_mode = FALSE;
+               } else {
+                       _bt_reliable_terminate_service(NULL);
+               }
+       } else {
+               _bt_set_disabled(BLUETOOTH_ERROR_NONE);
        }
 
+       if (eventsystem_unregister_event(status_reg_id) != ES_R_OK)
+               BT_ERR("Fail to unregister system event");
 }
 
 static gboolean __bt_enable_timeout_cb(gpointer user_data)
@@ -940,7 +938,8 @@ static gboolean __bt_enable_timeout_cb(gpointer user_data)
        g_variant_unref(result);
        _bt_set_disabled(BLUETOOTH_ERROR_TIMEOUT);
 
-       _bt_terminate_service(NULL);
+       if (!TIZEN_FEATURE_BT_USB_DONGLE)
+               _bt_terminate_service(NULL);
 
        return FALSE;
 }
@@ -1016,7 +1015,6 @@ void _bt_adapter_start_enable_timer(void)
        return;
 }
 
-#ifdef TIZEN_TV
 static gboolean __bt_adapter_enabled_cb(gpointer user_data)
 {
        BT_DBG("+");
@@ -1026,7 +1024,31 @@ static gboolean __bt_adapter_enabled_cb(gpointer user_data)
 
        return FALSE;
 }
-#endif
+
+int _bt_enable_adapter_check_status(void)
+{
+       bt_status_t status = _bt_adapter_get_status();
+       bt_le_status_t le_status = _bt_adapter_get_le_status();
+
+       BT_DBG("");
+
+       if (status == BT_ACTIVATING) {
+               BT_ERR("Enabling in progress");
+               return BLUETOOTH_ERROR_IN_PROGRESS;
+       }
+
+       if (status == BT_ACTIVATED) {
+               BT_ERR("Already enabled");
+               return BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED;
+       }
+
+       if (status == BT_DEACTIVATING || le_status == BT_LE_DEACTIVATING) {
+               BT_ERR("Disabling in progress");
+               return BLUETOOTH_ERROR_DEVICE_BUSY;
+       }
+
+       return BLUETOOTH_ERROR_NONE;
+}
 
 int _bt_enable_adapter(void)
 {
@@ -1056,8 +1078,7 @@ int _bt_enable_adapter(void)
 
        _bt_adapter_set_status(BT_ACTIVATING);
 
-#ifdef TIZEN_TV
-{
+if (TIZEN_PROFILE_TV) {
        int adapter_status = BT_ADAPTER_DISABLED;
 
        if (vconf_set_int(VCONFKEY_BT_STATUS, VCONFKEY_BT_STATUS_OFF) != 0)
@@ -1070,7 +1091,6 @@ int _bt_enable_adapter(void)
                return BLUETOOTH_ERROR_NONE;
        }
 }
-#endif
 
        proxy = __bt_get_core_proxy();
        if (!proxy)
@@ -1079,11 +1099,10 @@ int _bt_enable_adapter(void)
        if (le_status == BT_LE_ACTIVATED) {
                BT_INFO("LE Already enabled. Just turn on PSCAN");
                ret = _bt_set_connectable(TRUE);
-               if (ret == BLUETOOTH_ERROR_NONE) {
+               if (ret == BLUETOOTH_ERROR_NONE)
                        _bt_adapter_set_status(BT_ACTIVATED);
-               } else {
+               else
                        return BLUETOOTH_ERROR_INTERNAL;
-               }
        }
 
        result = g_dbus_proxy_call_sync(proxy, "EnableAdapter",
@@ -1091,8 +1110,8 @@ int _bt_enable_adapter(void)
                                         G_DBUS_CALL_FLAGS_NONE, BT_ENABLE_TIMEOUT,
                                         NULL, &error);
         if (error) {
-                BT_ERR("EnableAdapterLe failed: %s", error->message);
-               _bt_adapter_set_status(BT_DEACTIVATED);
+               BT_ERR("EnableAdapterLe failed: %s", error->message);
+               _bt_adapter_set_status(BT_DEACTIVATED);
                g_clear_error(&error);
                error = NULL;
                result = g_dbus_proxy_call_sync(proxy,
@@ -1109,15 +1128,15 @@ int _bt_enable_adapter(void)
                }
                g_variant_unref(result);
                /* Terminate myself */
-               g_idle_add((GSourceFunc)_bt_terminate_service, NULL);
+               if (!TIZEN_FEATURE_BT_USB_DONGLE)
+                       g_idle_add((GSourceFunc)_bt_terminate_service, NULL);
                return BLUETOOTH_ERROR_INTERNAL;
        }
        g_variant_unref(result);
-       if (le_status == BT_LE_ACTIVATED) {
+       if (le_status == BT_LE_ACTIVATED)
                __bt_set_enabled();
-       } else {
+       else
                _bt_adapter_start_enable_timer();
-       }
 
        return BLUETOOTH_ERROR_NONE;
 }
@@ -1139,7 +1158,7 @@ static gboolean __bt_disconnect_all(void)
 
        BT_DBG("");
 
-       conn = _bt_get_system_gconn();
+       conn = _bt_gdbus_get_system_gconn();
 
        device_list = g_array_new(FALSE, FALSE, sizeof(gchar));
 
@@ -1203,6 +1222,7 @@ static gboolean __bt_disconnect_all(void)
        return ret;
 }
 
+#if 0
 static gboolean __bt_set_disabled_timeout_cb(gpointer user_data)
 {
        BT_DBG("");
@@ -1210,12 +1230,15 @@ static gboolean __bt_set_disabled_timeout_cb(gpointer user_data)
 
        return FALSE;
 }
+#endif
 
-int __bt_disable_cb(void)
+int _bt_disable_cb(void)
 {
        FN_START;
        GDBusProxy *proxy;
+#if 0
        int ret;
+#endif
        GVariant *result;
        GError *error = NULL;
 
@@ -1267,6 +1290,25 @@ int __bt_disable_cb(void)
        return BLUETOOTH_ERROR_NONE;
 }
 
+int _bt_disable_adapter_check_status(void)
+{
+       bt_status_t status = _bt_adapter_get_status();
+
+       BT_DBG("");
+
+       if (status == BT_DEACTIVATING) {
+               BT_DBG("Disabling in progress");
+               return BLUETOOTH_ERROR_IN_PROGRESS;
+       }
+
+       if (status == BT_DEACTIVATED) {
+               BT_DBG("Already disabled");
+               return BLUETOOTH_ERROR_DEVICE_NOT_ENABLED;
+       }
+
+       return BLUETOOTH_ERROR_NONE;
+}
+
 int _bt_disable_adapter(void)
 {
        BT_DBG("+");
@@ -1286,9 +1328,18 @@ int _bt_disable_adapter(void)
                g_source_remove(timer_id);
                timer_id = 0;
        }
+/* unregister all the services/servers/profiles registered on bluez-adapter
+    once adapter is removed, reinitializing of the state-varaibles becomes
+    a problem */
+       if (_bt_unregister_obex_server() != BLUETOOTH_ERROR_NONE)
+               BT_ERR("Fail to unregister obex server");
+
+       if (_bt_unregister_media_player() != BLUETOOTH_ERROR_NONE)
+               BT_ERR("Fail to unregister media player");
 
+/* Other unregister APIs should be placed here */
        __bt_disconnect_all();
-       ret = __bt_disable_cb();
+       ret = _bt_disable_cb();
 
        BT_DBG("-");
        return ret;
@@ -1333,6 +1384,8 @@ int _bt_recover_adapter(void)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
+       is_recovery_mode = TRUE;
+
        g_variant_unref(result);
        __bt_disconnect_all();
 
@@ -1371,17 +1424,15 @@ int _bt_reset_adapter(void)
 
        g_variant_unref(result);
        /* Terminate myself */
-       if (_bt_adapter_get_status() == BT_DEACTIVATED) {
+       if (_bt_adapter_get_status() == BT_DEACTIVATED)
                g_idle_add((GSourceFunc)_bt_terminate_service, NULL);
-       }
 
        return BLUETOOTH_ERROR_NONE;
 }
 
-#ifndef TIZEN_TV
 int _bt_check_adapter(int *status)
 {
-
+if (!TIZEN_PROFILE_TV) {
        char *adapter_path = NULL;
 
        BT_CHECK_PARAMETER(status, return);
@@ -1396,10 +1447,7 @@ int _bt_check_adapter(int *status)
 
        g_free(adapter_path);
        return BLUETOOTH_ERROR_NONE;
-}
-#else
-int _bt_check_adapter(int *status)
-{
+} else {
        GDBusProxy *proxy;
        GError *error = NULL;
        GVariant *result;
@@ -1442,7 +1490,7 @@ int _bt_check_adapter(int *status)
        g_variant_unref(temp);
        return BLUETOOTH_ERROR_NONE;
 }
-#endif
+}
 
 int _bt_enable_adapter_le(void)
 {
@@ -1605,11 +1653,10 @@ int _bt_get_local_address(bluetooth_device_address_t *local_address)
        address = g_variant_get_string(temp, NULL);
        BT_DBG("Address:%s", address);
 
-       if (address) {
+       if (address)
                _bt_convert_addr_string_to_type(local_address->addr, address);
-       } else {
+       else
                return BLUETOOTH_ERROR_INTERNAL;
-       }
 
        g_variant_unref(result);
        g_variant_unref(temp);
@@ -1767,9 +1814,9 @@ int _bt_is_service_used(char *service_uuid, gboolean *used)
        GError *error = NULL;
        int ret = BLUETOOTH_ERROR_NONE;
        GVariant *result;
-       GVariant *value;
+       GVariant *temp = NULL;
        GVariantIter *iter = NULL;
-       gchar *uuid;
+       gchar *uuid = NULL;
 
        BT_DBG("+");
        BT_CHECK_PARAMETER(service_uuid, return);
@@ -1796,31 +1843,21 @@ int _bt_is_service_used(char *service_uuid, gboolean *used)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-       g_variant_get(result, "(v)", &value);
-       g_variant_get(value, "as", &iter);
-       if (iter == NULL) {
-               BT_ERR("Failed to get UUIDs(%s)", service_uuid);
-               *used = FALSE;
-               g_variant_unref(result);
-               g_variant_unref(value);
-               return ret;
-       }
+       g_variant_get(result, "(v)", &temp);
+       g_variant_get(temp, "as", &iter);
 
-       while (g_variant_iter_loop(iter, "s", &uuid)) {
+       *used = FALSE;
+       while (g_variant_iter_loop(iter, "&s", &uuid)) {
                if (strcasecmp(uuid, service_uuid) == 0) {
                        *used = TRUE;
-                       g_free(uuid);
-                       goto done;
+                       break;
                }
        }
-
-       *used = FALSE;
-
-done:
        g_variant_iter_free(iter);
-       g_variant_unref(value);
        g_variant_unref(result);
+
        BT_DBG("Service Used? %d", *used);
+
        return ret;
 }
 
@@ -1893,20 +1930,28 @@ int _bt_set_discoverable_mode(int discoverable_mode, int timeout)
        GError *error = NULL;
        GDBusProxy *proxy;
        GVariant *result;
+#ifdef TIZEN_FEATURE_BT_DPM
+       int discoverable_state = DPM_BT_ERROR;
+#endif
 
        proxy = _bt_get_adapter_properties_proxy();
 
        retv_if(proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
 
-#ifdef TIZEN_DPM_ENABLE
+#ifdef TIZEN_FEATURE_BT_DPM
+       _bt_dpm_get_bluetooth_limited_discoverable_state(&discoverable_state);
        if (discoverable_mode != BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE &&
-               _bt_dpm_get_bluetooth_limited_discoverable_state() == DPM_RESTRICTED) {
-               _bt_launch_dpm_popup("DPM_POLICY_DISABLE_BT_HANDSFREE");
+                discoverable_state == DPM_RESTRICTED) {
+               if (headed_plugin_info->plugin_headed_enabled)
+                       headed_plugin_info->headed_plugin->bt_launch_dpmpopup("DPM_POLICY_DISABLE_BT_HANDSFREE");
+
                return BLUETOOTH_ERROR_ACCESS_DENIED;
        }
        if (discoverable_mode != BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE &&
-                _bt_dpm_get_bluetooth_limited_discoverable_state() == DPM_RESTRICTED) {
-               _bt_launch_dpm_popup("DPM_POLICY_DISABLE_BT");
+               discoverable_state == DPM_RESTRICTED) {
+               if (headed_plugin_info->plugin_headed_enabled)
+                       headed_plugin_info->headed_plugin->bt_launch_dpmpopup("DPM_POLICY_DISABLE_BT");
+
                return BLUETOOTH_ERROR_ACCESS_DENIED;
        }
 #endif
@@ -2031,7 +2076,7 @@ int _bt_start_discovery(void)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-       is_discovering = TRUE;
+       discovery_req = TRUE;
        cancel_by_user = FALSE;
        /* discovery status will be change in event */
        g_variant_unref(result);
@@ -2079,7 +2124,7 @@ int _bt_start_custom_discovery(bt_discovery_role_type_t role)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-       is_discovering = TRUE;
+       discovery_req = TRUE;
        cancel_by_user = FALSE;
        /* discovery status will be change in event */
        g_variant_unref(result);
@@ -2109,14 +2154,22 @@ int _bt_cancel_discovery(void)
                                &error);
 
        if (!result) {
+               int ret = BLUETOOTH_ERROR_INTERNAL;
                if (error != NULL) {
                        BT_ERR("StopDiscovery failed (Error: %s)", error->message);
+
+                       if (g_strrstr(error->message, "No discovery started"))
+                               ret = BLUETOOTH_ERROR_NOT_IN_OPERATION;
+
                        g_clear_error(&error);
-               } else
+               } else {
                        BT_ERR("StopDiscovery failed");
-               return BLUETOOTH_ERROR_INTERNAL;
+               }
+
+               return ret;
        }
 
+       discovery_req = FALSE;
        cancel_by_user = TRUE;
        /* discovery status will be change in event */
        g_variant_unref(result);
@@ -2125,7 +2178,7 @@ int _bt_cancel_discovery(void)
 
 gboolean _bt_is_discovering(void)
 {
-       return is_discovering;
+       return (is_discovering || discovery_req);
 }
 
 gboolean _bt_is_connectable(void)
@@ -2201,7 +2254,7 @@ int _bt_set_connectable(gboolean is_connectable)
                return BLUETOOTH_ERROR_INTERNAL;
        }
 
-       BT_INFO("Set connectable [%d]", is_connectable);
+       BT_INFO_C("### Set connectable [%d]", is_connectable);
        g_variant_unref(result);
        return BLUETOOTH_ERROR_NONE;
 }
@@ -2333,6 +2386,8 @@ static bluetooth_device_info_t *__bt_parse_device_info(GVariantIter *item_iter)
                                g_strlcpy(dev_info->device_name.name, alias,
                                                BLUETOOTH_DEVICE_NAME_LENGTH_MAX+1);
                        }
+               } else if (!g_strcmp0(key, "IsAliasSet")) {
+                       dev_info->is_alias_set = g_variant_get_boolean(value);
                } else if (!g_strcmp0(key, "Connected")) {
                        dev_info->connected = g_variant_get_byte(value);
                } else if (!g_strcmp0(key, "Paired")) {
@@ -2370,14 +2425,12 @@ static bluetooth_device_info_t *__bt_parse_device_info(GVariantIter *item_iter)
                } else if (strcasecmp(key, "ManufacturerData") == 0) {
                        manufacturer_data = g_byte_array_new();
                        g_variant_get(value, "ay", &char_value_iter);
-
                        while (g_variant_iter_loop(char_value_iter, "y",  &char_value))
                                g_byte_array_append(manufacturer_data, &char_value, 1);
 
                        if (manufacturer_data) {
-                               if (manufacturer_data->len > 0) {
+                               if (manufacturer_data->len > 0)
                                        memcpy(dev_info->manufacturer_data.data, manufacturer_data->data, manufacturer_data->len);
-                               }
                        }
                        g_variant_iter_free(char_value_iter);
                        g_byte_array_free(manufacturer_data, TRUE);
@@ -2433,7 +2486,7 @@ int _bt_get_bonded_devices(GArray **dev_list)
        GVariantIter *iter = NULL;
        GError *error = NULL;
 
-       conn = _bt_get_system_conn();
+       conn = _bt_gdbus_get_system_gconn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        manager_proxy = _bt_get_manager_proxy();
@@ -2466,6 +2519,114 @@ int _bt_get_bonded_devices(GArray **dev_list)
        return BLUETOOTH_ERROR_NONE;
 }
 
+int _bt_get_profile_connected_devices(char *profile_uuid, GArray **addr_list)
+{
+       BT_DBG("+");
+       GDBusConnection *conn;
+       GDBusProxy *manager_proxy;
+       GVariant *result = NULL;
+       GVariant *result1 = NULL;
+       GVariantIter *iter = NULL;
+       GError *error = NULL;
+       char *object_path = NULL;
+       GVariantIter *interface_iter;
+       char *interface_str = NULL;
+       GDBusProxy *device_proxy = NULL;
+       gboolean is_connected = FALSE;
+
+       conn = _bt_gdbus_get_system_gconn();
+       retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
+
+       manager_proxy = _bt_get_manager_proxy();
+       retv_if(manager_proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
+
+       result = g_dbus_proxy_call_sync(manager_proxy, "GetManagedObjects",
+                               NULL,
+                               G_DBUS_CALL_FLAGS_NONE,
+                               -1,
+                               NULL,
+                               NULL);
+
+       if (!result) {
+               if (error != NULL) {
+                       BT_ERR("Failed to GetManagedObjects (Error: %s)", error->message);
+                       g_clear_error(&error);
+                       error = NULL;
+               } else
+                       BT_ERR("Failed to Failed to GetManagedObjects");
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+
+       /* signature of GetManagedObjects:  a{oa{sa{sv}}} */
+       g_variant_get(result, "(a{oa{sa{sv}}})", &iter);
+
+       /* Parse the signature:  oa{sa{sv}}} */
+       while (g_variant_iter_loop(iter, "{&oa{sa{sv}}}", &object_path, &interface_iter)) {
+               if (object_path == NULL)
+                       continue;
+
+               while (g_variant_iter_loop(interface_iter, "{sa{sv}}",
+                               &interface_str, NULL)) {
+                       if (g_strcmp0(interface_str, "org.bluez.Device1") == 0) {
+                               BT_DBG("Found a device: %s", object_path);
+                               g_free(interface_str);
+
+                               device_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
+                                                                                       NULL, BT_BLUEZ_NAME,
+                                                                                       object_path, BT_DEVICE_INTERFACE,  NULL, NULL);
+
+                               if (device_proxy == NULL) {
+                                       BT_DBG("Device don't have this service");
+                                       break;
+                               }
+
+                               result1 = g_dbus_proxy_call_sync(device_proxy, "IsConnectedProfile",
+                                                       g_variant_new("(s)", profile_uuid),
+                                                       G_DBUS_CALL_FLAGS_NONE,
+                                                       -1,
+                                                       NULL,
+                                                       &error);
+
+                               if (result1 == NULL) {
+                                       BT_ERR("Error occured in Proxy call");
+                                       if (error) {
+                                               BT_ERR("Error occured in Proxy call [%s]\n", error->message);
+                                               g_error_free(error);
+                                               error = NULL;
+                                       }
+                                       g_object_unref(device_proxy);
+                                       break;
+                               }
+                               g_variant_get(result1, "(b)", &is_connected);
+
+                               if (is_connected == TRUE) {
+                                       char address[BT_ADDRESS_STRING_SIZE];
+                                       bluetooth_device_address_t *addr = NULL;
+
+                                       _bt_convert_device_path_to_address(object_path, address);
+
+                                       addr = g_malloc0(sizeof(bluetooth_device_address_t));
+                                       _bt_convert_addr_string_to_type(addr->addr, address);
+
+                                       g_array_append_vals(*addr_list, addr,
+                                                       sizeof(bluetooth_device_address_t));
+                               }
+
+                               g_variant_unref(result1);
+                               g_object_unref(device_proxy);
+
+                               break;
+                       }
+               }
+       }
+
+       g_variant_unref(result);
+       g_variant_iter_free(iter);
+
+       BT_DBG("-");
+       return BLUETOOTH_ERROR_NONE;
+}
+
 int _bt_get_bonded_device_info(bluetooth_device_address_t *device_address,
                                bluetooth_device_info_t *dev_info)
 {
@@ -2492,6 +2653,75 @@ int _bt_get_bonded_device_info(bluetooth_device_address_t *device_address,
        return ret;
 }
 
+int _bt_is_alias_set(bluetooth_device_address_t *device_address, gboolean *is_alias_set)
+{
+       char *object_path = NULL;
+       char address[BT_ADDRESS_STRING_SIZE] = { 0 };
+       gboolean alias_set = FALSE;
+
+       GDBusConnection *conn;
+       GDBusProxy *device_proxy;
+       GError *error = NULL;
+       GVariant *result = NULL;
+       GVariant *temp = NULL;
+
+
+       BT_CHECK_PARAMETER(device_address, return);
+       BT_CHECK_PARAMETER(is_alias_set, return);
+
+       _bt_convert_addr_type_to_string(address, device_address->addr);
+
+       object_path = _bt_get_device_object_path(address);
+       retv_if(object_path == NULL, BLUETOOTH_ERROR_NOT_PAIRED);
+
+       conn = _bt_gdbus_get_system_gconn();
+       if (conn == NULL) {
+               g_free(object_path);
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+
+       device_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
+                       NULL,
+                       BT_BLUEZ_NAME,
+                       object_path,
+                       BT_PROPERTIES_INTERFACE,
+                       NULL, NULL);
+       if (device_proxy == NULL) {
+               g_free(object_path);
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+
+       result = g_dbus_proxy_call_sync(device_proxy, "Get",
+                       g_variant_new("(ss)", BT_DEVICE_INTERFACE, "IsAliasSet"),
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1,
+                       NULL,
+                       &error);
+
+       if (!result) {
+               BT_ERR("Error occured in Proxy call");
+               if (error != NULL) {
+                       BT_ERR("Getting is_alias_set property failed: [%s]\n", error->message);
+                       g_error_free(error);
+               }
+               g_object_unref(device_proxy);
+               g_free(object_path);
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+
+       g_variant_get(result, "(v)", &temp);
+       alias_set = g_variant_get_boolean(temp);
+       *is_alias_set = alias_set;
+       BT_DBG("address: [%s] | *is_alias_set: %s", address, *is_alias_set ? "TRUE" : "FALSE");
+       g_variant_unref(temp);
+       g_variant_unref(result);
+       g_object_unref(device_proxy);
+
+       g_free(object_path);
+
+       return BLUETOOTH_ERROR_NONE;
+}
+
 int _bt_get_timeout_value(int *timeout)
 {
        time_t current_time;
@@ -2549,6 +2779,47 @@ int _bt_set_le_privacy(gboolean set_privacy)
        return BLUETOOTH_ERROR_NONE;
 }
 
+int _bt_set_le_static_random_address(gboolean is_enable)
+{
+       GDBusProxy *proxy;
+       GError *error = NULL;
+       GVariant *result = NULL;
+
+       if (__bt_is_factory_test_mode()) {
+               BT_ERR("Unable to set le random address in factory binary !!");
+               return BLUETOOTH_ERROR_NOT_SUPPORT;
+       }
+
+       if (_bt_adapter_get_status() != BT_ACTIVATED &&
+               _bt_adapter_get_le_status() != BT_LE_ACTIVATED) {
+               return BLUETOOTH_ERROR_DEVICE_NOT_ENABLED;
+       }
+
+       proxy = _bt_get_adapter_proxy();
+       retv_if(proxy == NULL, BLUETOOTH_ERROR_INTERNAL);
+
+       result = g_dbus_proxy_call_sync(proxy,
+                               "SetLeStaticRandomAddress",
+                               g_variant_new("(b)", is_enable),
+                               G_DBUS_CALL_FLAGS_NONE,
+                               -1,
+                               NULL,
+                               &error);
+
+       if (!result) {
+               if (error != NULL) {
+                       BT_ERR("Failed to SetLeStaticRandomAddress (Error: %s)", error->message);
+                       g_clear_error(&error);
+               } else
+                       BT_ERR("Failed to SetLeStaticRandomAddress");
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+
+       g_variant_unref(result);
+       BT_INFO("SetLeStaticRandomAddress as %d", is_enable);
+       return BLUETOOTH_ERROR_NONE;
+}
+
 int _bt_set_manufacturer_data(bluetooth_manufacturer_data_t *m_data)
 {
        GDBusProxy *proxy;
@@ -2570,9 +2841,8 @@ int _bt_set_manufacturer_data(bluetooth_manufacturer_data_t *m_data)
 
        builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
-       for (i = 0; i < (m_data->data_len) + 2; i++) {
+       for (i = 0; i < (m_data->data_len) + 2; i++)
                g_variant_builder_add(builder, "y", m_data->data[i]);
-       }
 
        val = g_variant_new("(ay)", builder);
 
@@ -2595,9 +2865,8 @@ int _bt_set_manufacturer_data(bluetooth_manufacturer_data_t *m_data)
        }
        builder = g_variant_builder_new(G_VARIANT_TYPE("ay"));
 
-       for (i = 0; i < (m_data->data_len) + 2; i++) {
+       for (i = 0; i < (m_data->data_len) + 2; i++)
                g_variant_builder_add(builder, "y", m_data->data[i]);
-       }
 
        val = g_variant_new("(ay)", builder);
 
@@ -2613,9 +2882,192 @@ int _bt_set_manufacturer_data(bluetooth_manufacturer_data_t *m_data)
        return BLUETOOTH_ERROR_NONE;
 }
 
-#ifdef TIZEN_TV
+
+int _bt_service_set_alarm(int timeout, bt_set_alarm_cb call_back, void *user_data, alarm_id_t *alarm_id)
+{
+       int result = BLUETOOTH_ERROR_NONE;
+       bt_service_alarm_t *alarm = NULL;
+
+       if (!call_back || !alarm_id)
+               return BLUETOOTH_ERROR_INVALID_PARAM;
+
+       if (!alarm_mgr.is_alarm_initialized) {
+               result = alarmmgr_init("bt-service");
+               if (result != 0) {
+                       BT_ERR("Failed to initialize alarm = %d", result);
+                       result = BLUETOOTH_ERROR_INTERNAL;
+                       goto finish;
+               }
+               result = alarmmgr_set_cb(alarm_cb, NULL);
+               if (result != 0) {
+                       BT_ERR("Failed to set the callback = %d", result);
+                       result = BLUETOOTH_ERROR_INTERNAL;
+                       goto finish;
+               }
+               alarm_mgr.is_alarm_initialized = TRUE;
+       }
+
+       alarm = g_malloc0(sizeof(bt_service_alarm_t));
+       if (!alarm)
+               return BLUETOOTH_ERROR_MEMORY_ALLOCATION;
+
+       result = alarmmgr_add_alarm(ALARM_TYPE_VOLATILE, timeout,
+                                               0, NULL, alarm_id);
+       if (result != 0) {
+               BT_ERR("Failed to create alarm error = %d", result);
+               result = BLUETOOTH_ERROR_INTERNAL;
+               g_free(alarm);
+               goto finish;
+       }
+       alarm->alarm_id = *alarm_id;
+       alarm->callback = call_back;
+       alarm->user_data = user_data;
+
+       alarm_mgr.g_alarm_list = g_list_append(alarm_mgr.g_alarm_list, alarm);
+       result = BLUETOOTH_ERROR_NONE;
+finish:
+       return result;
+}
+
+static int alarm_cb(alarm_id_t alarm_id, void* user_param)
+{
+       GList *node = NULL;
+       bt_service_alarm_t *p_data;
+       bt_set_alarm_cb callback = NULL;
+       void *user_data = NULL;
+
+       node = g_list_find_custom(alarm_mgr.g_alarm_list,
+                       GINT_TO_POINTER(alarm_id), compare_alarm);
+       if (!node)
+               return 0;
+
+       p_data = (bt_service_alarm_t *)node->data;
+       alarm_mgr.g_alarm_list = g_list_delete_link(alarm_mgr.g_alarm_list,
+                       node);
+
+       if (!p_data)
+               return 0;
+
+       callback = p_data->callback;
+       user_data = p_data->user_data;
+       g_free(p_data);
+
+       if (callback)
+               callback(alarm_id, user_data);
+
+       return 0;
+}
+
+int _bt_service_remove_alarm(alarm_id_t alarm_id)
+{
+       GList *list = NULL;
+       bt_service_alarm_t *p_data;
+       list = g_list_find_custom(alarm_mgr.g_alarm_list, GINT_TO_POINTER(alarm_id), compare_alarm);
+
+       if (list != NULL) {
+               alarmmgr_remove_alarm(alarm_id);
+               p_data = (bt_service_alarm_t *)list->data;
+               alarm_mgr.g_alarm_list = g_list_remove(alarm_mgr.g_alarm_list, list->data);
+               g_free(p_data);
+       }
+
+       return 0;
+}
+
+gint compare_alarm(gconstpointer list_data, gconstpointer data)
+{
+#ifdef ARCH64
+       alarm_id_t alarm_id = (alarm_id_t)(uintptr_t)data;
+#else
+       alarm_id_t alarm_id = (alarm_id_t)data;
+#endif
+       bt_service_alarm_t *p_data = (bt_service_alarm_t *)list_data;
+
+       if (p_data->alarm_id == alarm_id)
+               return 0;
+
+       return 1;
+}
+
+static void alarm_data_free(void *data)
+{
+       bt_service_alarm_t *p_data = (bt_service_alarm_t *)data;
+       g_free(p_data);
+       return;
+}
+
+static gboolean _bt_adapter_request_delayed_cb(gpointer user_data)
+{
+       int result;
+#ifdef ARCH64
+       int function = (int)(uintptr_t)user_data;
+#else
+       int function = (int)user_data;
+#endif
+
+       switch (function) {
+       case BT_ENABLE_ADAPTER:
+               result = _bt_enable_adapter();
+               if (result != BLUETOOTH_ERROR_NONE) {
+                       BT_ERR("_bt_enable_adapter is failed");
+                       /* Send enabled event to API */
+                       _bt_send_event(BT_ADAPTER_EVENT, BLUETOOTH_EVENT_ENABLED,
+                                       g_variant_new("(i)", result));
+               }
+               break;
+       case BT_DISABLE_ADAPTER:
+               result = _bt_disable_adapter();
+               if (result != BLUETOOTH_ERROR_NONE) {
+                       BT_ERR("_bt_disable_adapter is failed");
+                       /* Send disabled event to API */
+                       _bt_send_event(BT_ADAPTER_EVENT, BLUETOOTH_EVENT_DISABLED,
+                                       g_variant_new("(i)", result));
+               }
+               break;
+       default:
+               BT_ERR("function is NOT matched");
+               break;
+       }
+
+       return FALSE;
+}
+
+int _bt_adapter_request_delayed(int function)
+{
+       int ret;
+
+       switch (function) {
+       case BT_ENABLE_ADAPTER:
+               ret = _bt_enable_adapter_check_status();
+               if (ret == BLUETOOTH_ERROR_NONE)
+                       _bt_adapter_set_status(BT_ACTIVATING);
+               else
+                       return ret;
+
+               break;
+       case BT_DISABLE_ADAPTER:
+               ret = _bt_disable_adapter_check_status();
+               if (ret == BLUETOOTH_ERROR_NONE)
+                       _bt_adapter_set_status(BT_DEACTIVATING);
+               else
+                       return ret;
+
+               break;
+       default:
+               BT_ERR("function is NOT matched");
+               return BLUETOOTH_ERROR_INTERNAL;
+       }
+
+#ifdef ARCH64
+       g_idle_add((GSourceFunc)_bt_adapter_request_delayed_cb, (void *)(uintptr_t)function);
+#else
+       g_idle_add((GSourceFunc)_bt_adapter_request_delayed_cb, (void *)function);
+#endif
+
+       return BLUETOOTH_ERROR_NONE;
+}
+
 int _bt_get_enable_timer_id(void)
 {
        return timer_id;
 }
-#endif