X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-event-receiver.c;h=aa157642ce1bac03f71c58594b33cf9e80a00fa7;hb=refs%2Fchanges%2F27%2F183527%2F1;hp=36101103f5f6cd9549f95186600bf9960bc3d3d9;hpb=81aac60ae7cc55ede31ec3079883a1704c916132;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c index 3610110..aa15764 100644 --- a/bt-service/bt-service-event-receiver.c +++ b/bt-service/bt-service-event-receiver.c @@ -39,6 +39,7 @@ #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" @@ -73,7 +74,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; @@ -105,7 +106,7 @@ static bt_le_adv_info_t *__bt_get_adv_ind_info(char *addr) retv_if(!addr, NULL); bt_le_adv_info_t *adv_info = NULL; GList *current = g_list_first((GList *)p_adv_ind_list); - while(current && current->data) { + while (current && current->data) { adv_info = (bt_le_adv_info_t *)current->data; if (adv_info && !g_strcmp0(adv_info->addr, addr)) return adv_info; @@ -202,7 +203,7 @@ static gboolean __bt_parse_device_properties(GVariant *item, } else if (strcasecmp(key, "UUIDs") == 0) { char **uuid_value; gsize size = 0; - int i =0; + int i = 0; size = g_variant_get_size(val); if (size > 0) { @@ -216,7 +217,7 @@ static gboolean __bt_parse_device_properties(GVariant *item, } g_free(uuid_value); } - } else if (strcasecmp(key, "ManufacturerDataLen") == 0) { + } else if (strcasecmp(key, "LegacyManufacturerDataLen") == 0) { g_variant_get(val, "q", &dev_info->manufacturer_data_len); if (dev_info->manufacturer_data_len > BLUETOOTH_MANUFACTURER_DATA_LENGTH_MAX) { BT_ERR("manufacturer_data_len is too long(len = %d)", dev_info->manufacturer_data_len); @@ -225,7 +226,7 @@ static gboolean __bt_parse_device_properties(GVariant *item, if (dev_info->manufacturer_data_len == 0) dev_info->manufacturer_data = g_strdup(""); - } else if (strcasecmp(key, "ManufacturerData") == 0) { + } else if (strcasecmp(key, "LegacyManufacturerData") == 0) { int i = 0; int len = 0; GVariantIter *value_iter; @@ -308,18 +309,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 +327,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); @@ -349,15 +347,14 @@ static gboolean __bt_le_discovery_finished_cb(gpointer user_data) 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 +430,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("+"); @@ -580,13 +593,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(); @@ -606,12 +619,17 @@ 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) + return; + g_variant_get(val, "b", &discovering); /* Send event to application */ BT_DBG("Discovering %d", discovering); @@ -646,6 +664,10 @@ 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) + return; + g_variant_get(val, "b", &le_discovering); /* Send event to application */ if (le_discovering == TRUE) { @@ -777,7 +799,10 @@ static void __bt_adapter_property_changed_event(GVariant *msg, const char *path) #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 && @@ -1284,6 +1309,70 @@ 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; + 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); + 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 +1402,14 @@ 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); + } 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); } @@ -1335,13 +1432,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; @@ -1530,17 +1627,14 @@ void __bt_gatt_char_property_changed_event(GVariant *msg, 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"); + BT_INFO("Notifying is %s", property_flag ? "enabled" : "disabled"); } else if (strcasecmp(property, "ChangedValue") == 0) { int len = 0; GByteArray *gp_byte_array = NULL; @@ -1629,7 +1723,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 +1755,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 +1805,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,10 +1854,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); @@ -1774,6 +1864,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*/ @@ -1792,7 +1885,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); @@ -1801,15 +1893,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; @@ -1841,7 +1935,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path */ _bt_obex_check_pending_transfer(address); _bt_opp_client_is_sending(&sending); - if(sending == TRUE) + if (sending == TRUE) _bt_opp_client_check_pending_transfer(address); } param = g_variant_new("(isy)", result, address, addr_type); @@ -1858,15 +1952,14 @@ 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); _bt_convert_addr_string_to_secure_string(secure_address, address); - BT_DBG("Address: %s", secure_address); - BT_DBG("Profile UUID: %s", profile_uuid); - BT_DBG("State: %d", state); + BT_INFO_C("[%s] state: %s, addr: %s", + _bt_convert_uuid_to_string(profile_uuid), + _bt_convert_profile_state_to_string(state), secure_address); if ((strcmp(profile_uuid, A2DP_SINK_UUID) == 0) && (state == BT_PROFILE_STATE_CONNECTED)) { @@ -1956,7 +2049,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path _bt_audio_connect(wait_list->req_id, wait_list->type, &device_address, - wait_list->out_param1); + NULL); } } else if (strcmp(profile_uuid, AVRCP_TARGET_UUID) == 0) { @@ -2007,7 +2100,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) { @@ -2031,7 +2124,7 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path _bt_audio_connect(wait_list->req_id, wait_list->type, &device_address, - wait_list->out_param1); + NULL); /* Now free the wait list */ _bt_rel_wait_data(); } @@ -2073,15 +2166,18 @@ 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, + g_variant_get(msg, "(&syyii@ay)", &le_dev_info->address, &le_dev_info->addr_type, &le_dev_info->adv_type, &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); @@ -2105,21 +2201,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, @@ -2179,8 +2267,6 @@ void _bt_handle_device_event(GVariant *msg, const char *member, const char *path 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, @@ -2201,24 +2287,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) { - name = _bt_get_bonded_device_name(address); - } else { + if (connected == TRUE) + name = _bt_get_device_name(address); + 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 +2310,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 +2344,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); @@ -2312,7 +2390,7 @@ void _bt_handle_headset_event(GVariant *msg, const char *path) _bt_convert_addr_string_to_type(device_address.addr, wait_list->address); _bt_audio_connect(wait_list->req_id, wait_list->type, - &device_address, wait_list->out_param1); + &device_address, NULL); _bt_rel_wait_data(); } else if (event == BLUETOOTH_EVENT_AG_CONNECTED) { /* Add data to the connected list */ @@ -2382,7 +2460,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) { @@ -2449,7 +2527,7 @@ void _bt_handle_sink_event(GVariant *msg, const char *path) _bt_audio_connect(wait_list->req_id, wait_list->type, &device_address, - wait_list->out_param1); + NULL); } g_free(address); } else if (strcasecmp(value, "Connected") == 0) { @@ -2623,17 +2701,15 @@ static void __bt_manager_event_filter(GDBusConnection *connection, bt_cache_info_t *cache_info; bt_remote_dev_info_t *dev_info; - ret_if(_bt_is_discovering() == FALSE && - _bt_is_le_scanning() == FALSE); + if (_bt_is_discovering() == FALSE && + _bt_is_le_scanning() == FALSE) { + g_variant_unref(value); + return; + } 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; @@ -2717,13 +2793,13 @@ static void __bt_manager_event_filter(GDBusConnection *connection, 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,12 +2828,13 @@ static void __bt_manager_event_filter(GDBusConnection *connection, } if (strcasecmp(name, BT_BLUEZ_NAME) == 0) { - BT_DBG("Bluetoothd is terminated"); + BT_INFO_C("### Bluetoothd is terminated"); if (_bt_adapter_get_status() == BT_ACTIVATED) _bt_disable_cb(); _bt_handle_adapter_removed(); __bt_devices_list_free(); + _bt_service_adapter_le_deinit(); } _bt_obex_server_check_allocation(&value); @@ -2774,10 +2851,15 @@ 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); + g_free(name); g_free(previous); g_free(current); @@ -3641,4 +3723,3 @@ void _bt_deinit_service_event_receiver(void) BT_DBG("-"); } -