}
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);
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;
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();
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_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)) {
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,
&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);
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,
}
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();