Change the name of dbus property of EIR manufacturer data

Same property for adv is introduced in upstream

Change-Id: Ib65befe8105d88ca0bdd788ce904e3bfa592e3e2
Signed-off-by: injun.yang <injun.yang@samsung.com>

diff --git a/bt-oal/bluez_hal/src/bt-hal-agent.c b/bt-oal/bluez_hal/src/bt-hal-agent.c
index 6f600f3..ccab259 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-agent.c
+++ b/bt-oal/bluez_hal/src/bt-hal-agent.c
@@ -327,7 +327,7 @@ void __bt_hal_get_auth_info(GVariant *reply, char *auth_info)
                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);
@@ -340,7 +340,7 @@ void __bt_hal_get_auth_info(GVariant *reply, char *auth_info)
                } 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) ||

diff --git a/bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c
index b1f4671..1c86b8a 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c
+++ b/bt-oal/bluez_hal/src/bt-hal-device-dbus-handler.c
@@ -936,10 +936,10 @@ static gboolean __bt_device_bonded_device_info_cb(gpointer user_data)
                                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))

diff --git a/bt-oal/bluez_hal/src/bt-hal-event-receiver.c b/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
index 0c6077a..24b1a62 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
+++ b/bt-oal/bluez_hal/src/bt-hal-event-receiver.c
@@ -678,9 +678,9 @@ static gboolean __bt_hal_parse_device_properties(GVariant *item)
                                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);
@@ -1673,8 +1673,8 @@ static void __bt_hal_device_properties_lookup(GVariant *result, char *address)
                }
                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);
@@ -1685,10 +1685,10 @@ static void __bt_hal_device_properties_lookup(GVariant *result, char *address)
                /*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) {

diff --git a/bt-service-adaptation/services/obex/bt-service-obex-server.c b/bt-service-adaptation/services/obex/bt-service-obex-server.c
index 88c4c85..d74263a 100644 (file)
--- a/bt-service-adaptation/services/obex/bt-service-obex-server.c
+++ b/bt-service-adaptation/services/obex/bt-service-obex-server.c
@@ -332,7 +332,7 @@ void __bt_get_auth_info(GVariant *reply, char *auth_info)
                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);
@@ -345,7 +345,7 @@ void __bt_get_auth_info(GVariant *reply, char *auth_info)
                } 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) ||

diff --git a/bt-service/bt-service-adapter.c b/bt-service/bt-service-adapter.c
index e7f2ad4..205082a 100644 (file)
--- a/bt-service/bt-service-adapter.c
+++ b/bt-service/bt-service-adapter.c
@@ -355,9 +355,9 @@ static int __bt_get_bonded_device_info(gchar *device_path,
                        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))
@@ -2409,9 +2409,9 @@ static bluetooth_device_info_t *__bt_parse_device_info(GVariantIter *item_iter)
                        }
                        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))

diff --git a/bt-service/bt-service-common.c b/bt-service/bt-service-common.c
index 7ac9e9d..ac97955 100644 (file)
--- a/bt-service/bt-service-common.c
+++ b/bt-service/bt-service-common.c
@@ -1184,7 +1184,7 @@ void __bt_get_auth_info(GVariant *reply, char *auth_info)
                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);
@@ -1197,7 +1197,7 @@ void __bt_get_auth_info(GVariant *reply, char *auth_info)
                } 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) ||

diff --git a/bt-service/bt-service-device.c b/bt-service/bt-service-device.c
index d148791..4f19add 100644 (file)
--- a/bt-service/bt-service-device.c
+++ b/bt-service/bt-service-device.c
@@ -455,7 +455,7 @@ bt_remote_dev_info_t *_bt_get_remote_device_info_by_object_path(
                        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) {
@@ -466,7 +466,7 @@ bt_remote_dev_info_t *_bt_get_remote_device_info_by_object_path(
                } 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)) {

diff --git a/bt-service/bt-service-event-receiver.c b/bt-service/bt-service-event-receiver.c
index 05c8b94..0e65149 100644 (file)
--- a/bt-service/bt-service-event-receiver.c
+++ b/bt-service/bt-service-event-receiver.c
@@ -217,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);
@@ -226,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;