is_alias_set = FALSE;
}
if (is_alias_set == FALSE) {
- tmp_value = g_variant_lookup_value(reply, "ManufacturerDataLen",
+ tmp_value = g_variant_lookup_value(reply, "LagacyManufacturerDataLen",
G_VARIANT_TYPE_UINT16);
if (tmp_value) {
manufacturer_data_len = g_variant_get_uint16(tmp_value);
} else
manufacturer_data_len = 0;
- tmp_value = g_variant_lookup_value(reply, "ManufacturerData",
+ tmp_value = g_variant_lookup_value(reply, "LagacyManufacturerData",
G_VARIANT_TYPE_ARRAY);
if (tmp_value) {
if ((manufacturer_data_len == 0) ||
ev->num_props = num_props_tmp + 1;
g_free(uuid_value);
}
- } else if (!g_strcmp0(key, "ManufacturerDataLen")) {
+ } else if (!g_strcmp0(key, "LegacyManufacturerDataLen")) {
data_len = g_variant_get_uint16(value);
- DBG("ManufacturerDataLen [%d]", data_len);
- } else if (!g_strcmp0(key, "ManufacturerData")) {
+ DBG("LegacyManufacturerDataLen [%d]", data_len);
+ } else if (!g_strcmp0(key, "LegacyManufacturerData")) {
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_free(uuid_value);
}
- } else if (strcasecmp(key, "ManufacturerDataLen") == 0) {
+ } else if (strcasecmp(key, "LegacyManufacturerDataLen") == 0) {
/* TODO: To be handled later*/
- } else if (strcasecmp(key, "ManufacturerData") == 0) {
+ } else if (strcasecmp(key, "LegacyManufacturerData") == 0) {
/* TODO: To be handled later*/
} else {
ERR("Unhandled Property:[%s]", key);
}
g_variant_unref(tmp_value);
- /* ManufacturerDataLen */
- tmp_value = g_variant_lookup_value(value, "ManufacturerDataLen", G_VARIANT_TYPE_UINT32);
+ /* LegacyManufacturerDataLen */
+ tmp_value = g_variant_lookup_value(value, "LegacyManufacturerDataLen", G_VARIANT_TYPE_UINT32);
unsigned int manufacturer_data_len = tmp_value ? g_variant_get_uint32(tmp_value) : 0;
if (manufacturer_data_len > BT_HAL_MANUFACTURER_DATA_LENGTH_MAX) {
ERR("manufacturer_data_len is too long(len = %d)", manufacturer_data_len);
/*size += __bt_insert_hal_properties(buf + size, HAL_PROP_DEVICE_MANUFACTURER_DATA_LEN,
sizeof(unsigned int), &manufacturer_data_len);
ev->num_props++;*/
- DBG("Device Manufacturer data length [%u]", manufacturer_data_len);
+ DBG("Device Legacy Manufacturer data length [%u]", manufacturer_data_len);
/* ManufacturerData */
- tmp_value = g_variant_lookup_value(value, "ManufacturerData", G_VARIANT_TYPE_BYTESTRING);
+ tmp_value = g_variant_lookup_value(value, "LegacyManufacturerData", G_VARIANT_TYPE_BYTESTRING);
manufacturer_data = value ? (gchar *)g_variant_get_bytestring(tmp_value) : NULL;
if (manufacturer_data) {
if (manufacturer_data_len > 0) {
is_alias_set = FALSE;
}
if (is_alias_set == FALSE) {
- tmp_value = g_variant_lookup_value(reply, "ManufacturerDataLen",
+ tmp_value = g_variant_lookup_value(reply, "LegacyManufacturerDataLen",
G_VARIANT_TYPE_UINT16);
if (tmp_value) {
manufacturer_data_len = g_variant_get_uint16(tmp_value);
} else
manufacturer_data_len = 0;
- tmp_value = g_variant_lookup_value(reply, "ManufacturerData",
+ tmp_value = g_variant_lookup_value(reply, "LegacyManufacturerData",
G_VARIANT_TYPE_ARRAY);
if (tmp_value) {
if ((manufacturer_data_len == 0) ||
rssi = g_variant_get_int16(value);
} else if (!g_strcmp0(key, "UUIDs")) {
__bt_get_service_list(value, dev_info);
- } else if (!g_strcmp0(key, "ManufacturerDataLen")) {
+ } else if (!g_strcmp0(key, "LegacyManufacturerDataLen")) {
dev_info->manufacturer_data.data_len = g_variant_get_uint16(value);
- } else if (!g_strcmp0(key, "ManufacturerData")) {
+ } else if (!g_strcmp0(key, "LegacyManufacturerData")) {
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))
}
dev_info->service_index = i;
g_variant_iter_free(iter);
- } else if (strcasecmp(key, "ManufacturerDataLen") == 0) {
+ } else if (strcasecmp(key, "LegacyManufacturerDataLen") == 0) {
dev_info->manufacturer_data.data_len = g_variant_get_uint16(value);
- } else if (strcasecmp(key, "ManufacturerData") == 0) {
+ } else if (strcasecmp(key, "LegacyManufacturerData") == 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))
is_alias_set = FALSE;
}
if (is_alias_set == FALSE) {
- tmp_value = g_variant_lookup_value(reply, "ManufacturerDataLen",
+ tmp_value = g_variant_lookup_value(reply, "LegacyManufacturerDataLen",
G_VARIANT_TYPE_UINT16);
if (tmp_value) {
manufacturer_data_len = g_variant_get_uint16(tmp_value);
} else
manufacturer_data_len = 0;
- tmp_value = g_variant_lookup_value(reply, "ManufacturerData",
+ tmp_value = g_variant_lookup_value(reply, "LegacyManufacturerData",
G_VARIANT_TYPE_ARRAY);
if (tmp_value) {
if ((manufacturer_data_len == 0) ||
g_variant_unref(tmp_value);
}
- tmp_value = g_variant_lookup_value(value, "ManufacturerDataLen", G_VARIANT_TYPE_UINT16);
+ tmp_value = g_variant_lookup_value(value, "LegacyManufacturerDataLen", G_VARIANT_TYPE_UINT16);
if (tmp_value) {
dev_info->manufacturer_data_len = g_variant_get_uint16(tmp_value);
if (dev_info->manufacturer_data_len > BLUETOOTH_MANUFACTURER_DATA_LENGTH_MAX) {
} else
dev_info->manufacturer_data_len = 0;
- tmp_value = g_variant_lookup_value(value, "ManufacturerData", G_VARIANT_TYPE_ARRAY);
+ tmp_value = g_variant_lookup_value(value, "LegacyManufacturerData", G_VARIANT_TYPE_ARRAY);
if (tmp_value) {
if ((dev_info->manufacturer_data_len == 0) ||
dev_info->manufacturer_data_len != g_variant_get_size(tmp_value)) {
}
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;