Recover bluetoothd crash
[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-event-receiver.c
index 0581b01..ced268a 100644 (file)
 #include "bt-service-headset-connection.h"
 #include "bt-service-avrcp-controller.h"
 #include "bt-service-hid.h"
+#include "bt-service-proximity.h"
 
 #include "bt-service-opp-client.h"
 
-#ifdef TIZEN_DPM_ENABLE
+#ifdef TIZEN_FEATURE_BT_DPM
 #include "bt-service-dpm.h"
 #endif
 
@@ -54,6 +55,7 @@ static GDBusConnection *opc_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;
@@ -73,7 +75,7 @@ typedef enum {
        OBEX_PBAP = (1 << 4),
        OBEX_IRMC = (1 << 5),
        OBEX_PCSUITE = (1 << 6),
-       OBEX_SYNCEVOLUTION =    (1 << 7),
+       OBEX_SYNCEVOLUTION = (1 << 7),
        OBEX_MAS = (1 << 8),
 } bluetooth_obex_connection_type_t;
 
@@ -308,18 +310,16 @@ void __bt_set_device_values(gboolean connected, int state)
 {
        int bt_device_state = VCONFKEY_BT_DEVICE_NONE;
 
-       if (vconf_get_int(VCONFKEY_BT_DEVICE, &bt_device_state) != 0) {
+       if (vconf_get_int(VCONFKEY_BT_DEVICE, &bt_device_state) != 0)
                BT_ERR("vconf_get_int failed");
-       }
 
        if (connected == TRUE)
                bt_device_state |= state;
        else if (bt_device_state & state)
                bt_device_state ^= state;
 
-       if (vconf_set_int(VCONFKEY_BT_DEVICE, bt_device_state) != 0) {
+       if (vconf_set_int(VCONFKEY_BT_DEVICE, bt_device_state) != 0)
                BT_ERR("vconf_set_int failed");
-       }
 }
 
 gboolean _bt_discovery_finished_cb(gpointer user_data)
@@ -328,9 +328,8 @@ gboolean _bt_discovery_finished_cb(gpointer user_data)
        event_id = 0;
        GVariant *param = NULL;
        if (_bt_get_discovering_property(DISCOVERY_ROLE_BREDR) == FALSE) {
-               if (_bt_get_cancel_by_user() == TRUE) {
+               if (_bt_get_cancel_by_user() == TRUE)
                        result = BLUETOOTH_ERROR_CANCEL_BY_USER;
-               }
 
                _bt_set_cancel_by_user(FALSE);
                _bt_set_discovery_status(FALSE);
@@ -346,18 +345,17 @@ 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) {
+               if (_bt_get_cancel_by_user() == TRUE)
                        result = BLUETOOTH_ERROR_CANCEL_BY_USER;
-               }
 
                g_list_free_full(p_adv_ind_list, __bt_free_bt_le_adv_info_t);
                p_adv_ind_list = NULL;
 
                _bt_set_cancel_by_user(FALSE);
-                _bt_disable_all_scanner_status();
+               _bt_disable_all_scanner_status();
                _bt_set_le_scan_status(FALSE);
                param = g_variant_new("(i)", result);
                _bt_send_event(BT_LE_ADAPTER_EVENT,
@@ -433,6 +431,22 @@ static void __bt_device_remote_connected_properties(
        BT_DBG("-");
 }
 
+gboolean __bt_handle_is_flight_mode_enabled(void)
+{
+#ifdef TIZEN_FEATURE_FLIGHTMODE_ENABLED
+       int is_flight_mode = 0;
+       int ret = -1;
+
+       ret = vconf_get_bool(VCONFKEY_TELEPHONY_FLIGHT_MODE, &is_flight_mode);
+       if (ret != 0)
+               BT_ERR("vconf_get_bool failed");
+
+       return (is_flight_mode == 0) ? FALSE : TRUE;
+#else
+       return FALSE;
+#endif
+}
+
 void _bt_handle_adapter_event(GVariant *msg, const char *member)
 {
        BT_DBG("+");
@@ -471,8 +485,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);
 
@@ -655,7 +667,7 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                                BLUETOOTH_EVENT_LE_DISCOVERY_STARTED,
                                param);
                        } else {
-                               ret_if(event_id > 0);
+                               ret_if(le_scan_event_id > 0);
 
                                adapter_proxy = _bt_get_adapter_proxy();
                                ret_if(adapter_proxy == NULL);
@@ -673,7 +685,7 @@ 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) {
@@ -772,12 +784,15 @@ 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
+#ifdef 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) {
-                                       _bt_disable_adapter();
+                                       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 &&
@@ -785,7 +800,7 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                                        _bt_set_le_disabled(BLUETOOTH_ERROR_NONE);
                                }
                        } else {
-#ifdef USB_BLUETOOTH
+#ifdef TIZEN_FEATURE_BT_USB_DONGLE
                                _bt_handle_adapter_added();
 #endif
                        }
@@ -810,6 +825,9 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                        char *value = NULL;
                        GVariantIter *iter = NULL;
                        g_variant_get(val, "as", &iter);
+
+                       ret_if(iter == NULL);
+
                        while (g_variant_iter_loop(iter, "s", &name)) {
                                BT_DBG("name = %s", name);
                                g_variant_iter_loop(iter, "s", &value);
@@ -817,8 +835,8 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path)
                                if (FALSE == _bt_update_le_feature_support(name, value))
                                        BT_INFO("Fail to update LE feature info");
                        }
-                       if (iter)
-                               g_variant_iter_free(iter);
+
+                       g_variant_iter_free(iter);
                } else if (strcasecmp(property, "IpspInitStateChanged") == 0) {
                        gboolean ipsp_initialized = FALSE;
 
@@ -895,6 +913,9 @@ static void __bt_device_property_changed_event(GVariant *msg, const char *path)
        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) {
@@ -936,11 +957,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);
@@ -948,9 +970,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);
 
@@ -959,7 +981,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;
                                        }
                                }
@@ -996,7 +1017,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) {
@@ -1284,6 +1304,71 @@ static void __bt_media_control_changed_event(GVariant *msg, const char *path)
        BT_DBG("-");
 }
 
+int get_alert_level_enum(const char *alert)
+{
+       int lvl = -1;
+
+       if (strcmp(alert, "none") == 0)
+               lvl = BT_PXP_ALERT_NONE;
+       else if (strcmp(alert, "mild") == 0)
+               lvl = BT_PXP_ALERT_MILD;
+       else if (strcmp(alert, "high") == 0)
+               lvl = BT_PXP_ALERT_HIGH;
+
+       return lvl;
+}
+
+static void _bt_handle_pxp_property_changed_event(GVariant *msg, const char *path, int role)
+{
+       int result = BLUETOOTH_ERROR_NONE;
+       int service_type;
+       int alert_lvl = -1;
+       GVariantIter value_iter;
+       char *property = NULL;
+       char *address;
+       GVariant *val = NULL;
+       GVariant *child = NULL;
+       GVariant *param = NULL;
+       g_variant_iter_init(&value_iter, msg);
+
+       BT_DBG("+");
+       while ((child = g_variant_iter_next_value(&value_iter))) {
+               g_variant_get(child, "{sv}", &property, &val);
+               BT_INFO("Property %s", property);
+
+               if ((strcasecmp(property, "LinkLossAlertLevel") == 0) ||
+                       (strcasecmp(property, "ImmediateAlertLevel") == 0)) {
+                       char *alert_str = NULL;
+
+                       address = g_malloc0(BT_ADDRESS_STRING_SIZE);
+                       _bt_convert_device_path_to_address(path, address);
+
+                       if (strcasecmp(property, "LinkLossAlertLevel") == 0)
+                               service_type = BT_PXP_PROPERTY_LLS;
+                       else
+                               service_type = BT_PXP_PROPERTY_IAS;
+
+                       g_variant_get(val, "s", &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);
+
+                       /* Send event to application */
+                       _bt_send_event(BT_DEVICE_EVENT,
+                                       BLUETOOTH_EVENT_PXP_PROPERTY_CHANGED,
+                                       param);
+                       g_free(address);
+                       g_free(alert_str);
+               }
+               g_free(property);
+               g_variant_unref(child);
+               g_variant_unref(val);
+       }
+       BT_DBG("-");
+}
+
 void _bt_handle_property_changed_event(GVariant *msg, const char *object_path)
 {
        char *interface_name = NULL;
@@ -1313,6 +1398,10 @@ void _bt_handle_property_changed_event(GVariant *msg, const char *object_path)
        } else if (strcasecmp(interface_name, BT_GATT_CHAR_INTERFACE) == 0) {
                __bt_gatt_char_property_changed_event(val,
                                        object_path);
+       } else if (strcasecmp(interface_name, BT_PROXIMITY_REPORTER_INTERFACE) == 0) {
+               BT_DBG("BT_PROXIMITY_REPORTER_INTERFACE");
+               _bt_handle_pxp_property_changed_event(val,
+                                       object_path, BT_PXP_REPORTER_ROLE);
        }
        g_variant_unref(val);
 }
@@ -1335,13 +1424,13 @@ void __bt_opc_property_changed_event(GVariant *msg,
                        g_variant_get(val, "s", &status);
                        BT_DBG("Status is %s", status);
 
-                       if (strcasecmp(status, "active") == 0) {
+                       if (strcasecmp(status, "active") == 0)
                                _bt_obex_client_started(path);
-                       } else if (strcasecmp(status, "complete") == 0) {
+                       else if (strcasecmp(status, "complete") == 0)
                                _bt_obex_client_completed(path, TRUE);
-                       } else if (strcasecmp(status, "error") == 0) {
+                       else if (strcasecmp(status, "error") == 0)
                                _bt_obex_client_completed(path, FALSE);
-                       }
+
                        g_free(status);
                } else if (strcasecmp(property, "Transferred") == 0) {
                        guint64 transferred  = 0;
@@ -1629,7 +1718,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);
@@ -1662,7 +1750,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);
 
@@ -1713,7 +1800,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);
 
@@ -1763,7 +1849,6 @@ 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);
@@ -1792,7 +1877,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);
 
@@ -1858,7 +1942,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);
@@ -2007,7 +2090,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                                _bt_audio_stop_auto_connect();
 #endif
                                _bt_add_headset_to_list(BT_AUDIO_A2DP_SOURCE,
-                                                    BT_STATE_CONNECTED, address);
+                                               BT_STATE_CONNECTED, address);
                                _bt_send_event(BT_A2DP_SOURCE_EVENT, event,
                                        g_variant_new("(is)", result, address));
                        } else if (state == BT_PROFILE_STATE_DISCONNECTED) {
@@ -2073,8 +2156,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,
@@ -2082,6 +2163,9 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                                                &le_dev_info->rssi,
                                                &le_dev_info->adv_data_len,
                                                &value);
+
+               ret_if(value == NULL);
+
                _bt_convert_device_path_to_address(path, le_dev_info->address);
 
                buffer_len = g_variant_get_size(value);
@@ -2105,21 +2189,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,
@@ -2173,25 +2249,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path
                                                event,
                                                param);
                g_free(address);
-       } else if (strcasecmp(member, "iBeaconReport") == 0) {
-               bt_remote_ibeacon_dev_info_t *ibeacon_dev_info = NULL;
-
-               ret_if(_bt_is_le_scanning() == FALSE);
-
-               ibeacon_dev_info = g_malloc0(sizeof(bt_remote_ibeacon_dev_info_t));
-               if (ibeacon_dev_info == NULL)
-                       return;
-
-               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);
        }
 }
 
@@ -2201,24 +2258,19 @@ void __bt_set_audio_values(gboolean connected, char *address)
        int bt_device_state = VCONFKEY_BT_DEVICE_NONE;
 
        /*  Set the headset name */
-       if (connected == TRUE) {
+       if (connected == TRUE)
                name = _bt_get_bonded_device_name(address);
-       } else {
+       else
                name = g_strdup("");
-       }
 
-       if (vconf_set_str(VCONFKEY_BT_HEADSET_NAME,
-                                       name) != 0) {
+       if (vconf_set_str(VCONFKEY_BT_HEADSET_NAME, name) != 0)
                BT_ERR("vconf_set_str failed");
-       }
 
        g_free(name);
 
        /*  Set the headset state */
-       if (vconf_get_int(VCONFKEY_BT_DEVICE,
-                               &bt_device_state) != 0) {
+       if (vconf_get_int(VCONFKEY_BT_DEVICE, &bt_device_state) != 0)
                BT_ERR("vconf_get_int failed");
-       }
 
 #ifdef TIZEN_SUPPORT_DUAL_HF
        if ((connected == TRUE) &&
@@ -2229,11 +2281,10 @@ void __bt_set_audio_values(gboolean connected, char *address)
                bt_device_state ^= VCONFKEY_BT_DEVICE_HEADSET_CONNECTED;
        }
 #else
-       if (connected == TRUE) {
+       if (connected == TRUE)
                bt_device_state |= VCONFKEY_BT_DEVICE_HEADSET_CONNECTED;
-       } else if (bt_device_state & VCONFKEY_BT_DEVICE_HEADSET_CONNECTED) {
+       else if (bt_device_state & VCONFKEY_BT_DEVICE_HEADSET_CONNECTED)
                bt_device_state ^= VCONFKEY_BT_DEVICE_HEADSET_CONNECTED;
-       }
 #endif
 
        if (vconf_set_int(VCONFKEY_BT_DEVICE,
@@ -2264,8 +2315,6 @@ void _bt_handle_headset_event(GVariant *msg, const char *path)
                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);
@@ -2382,7 +2431,7 @@ void _bt_handle_headset_event(GVariant *msg, const char *path)
        if (property)
                g_free(property);
        g_variant_unref(value);
- }
+}
 
 void _bt_handle_sink_event(GVariant *msg, const char *path)
 {
@@ -2611,7 +2660,7 @@ 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
+#ifdef TIZEN_FEATURE_BT_USB_DONGLE
                        BT_DBG("Enable Adapter");
                        _bt_enable_adapter();
 #else
@@ -2622,18 +2671,15 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                        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;
 
@@ -2659,9 +2705,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);
@@ -2713,17 +2759,17 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                }
                g_variant_unref(value);
        } else if (strcasecmp(signal_name, "InterfacesRemoved") == 0) {
-#ifdef USB_BLUETOOTH
+#ifdef TIZEN_FEATURE_BT_USB_DONGLE
                BT_DBG("InterfacesRemoved");
                _bt_handle_adapter_removed();
 #endif
-               if (g_strcmp0(interface_name, BT_MEDIATRANSPORT_INTERFACE) == 0) {
+               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) {
+               else if (g_strcmp0(interface_name, BT_DEVICE_INTERFACE) == 0)
                        bt_event = BT_DEVICE_EVENT;
-               } else if (g_strcmp0(interface_name, BT_PLAYER_CONTROL_INTERFACE) == 0) {
+               else if (g_strcmp0(interface_name, BT_PLAYER_CONTROL_INTERFACE) == 0)
                        bt_event = BT_AVRCP_CONTROL_EVENT;
-               }
+
                if ((bt_event != 0) && (bt_event != BT_MEDIA_TRANSFER_EVENT)) {
                        _bt_handle_adapter_event(parameters, signal_name);
                        if (bt_event == BT_AVRCP_CONTROL_EVENT) {
@@ -2752,10 +2798,12 @@ 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("### Recover it");
+                               _bt_recover_adapter();
+                       }
                        _bt_handle_adapter_removed();
                        __bt_devices_list_free();
                }
@@ -2778,6 +2826,10 @@ static  void __bt_manager_event_filter(GDBusConnection *connection,
                _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);
+
                g_free(name);
                g_free(previous);
                g_free(current);
@@ -3533,7 +3585,7 @@ 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. */
+#ifndef TIZEN_PROFILE_TV /* TODO: obexd doesn't work in TV profile. It should be resolved later. */
        GError *error = NULL;
 
        if (obexd_conn == NULL) {
@@ -3639,6 +3691,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("-");
 }