Change the name of dbus property of EIR manufacturer data

Same property for adv is introduced in upstream

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

diff --git a/client/main.c b/client/main.c
index 1a0a7c1..aaa6319 100644 (file)
--- a/client/main.c
+++ b/client/main.c
@@ -1536,7 +1536,7 @@ static void cmd_info(int argc, char *argv[])
        print_uuids(proxy);
        print_property(proxy, "Modalias");
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-       print_property(proxy, "ManufacturerDataLen");
+       print_property(proxy, "LegacyManufacturerDataLen");
 #endif
        print_property(proxy, "ManufacturerData");
        print_property(proxy, "ServiceData");

diff --git a/src/device.c b/src/device.c
index 544b06d..7cf7e78 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -619,17 +619,17 @@ static gboolean store_device_info_cb(gpointer user_data)
                str = manufacturer_data2str(device->manufacturer_data,
                                        device->manufacturer_data_len);
                g_key_file_set_string(key_file, "General",
-                               "ManufacturerData",
+                               "LegacyManufacturerData",
                                str);
                g_free(str);
                g_key_file_set_integer(key_file, "General",
-                               "ManufacturerDataLen",
+                               "LegacyManufacturerDataLen",
                                device->manufacturer_data_len);
        } else {
                g_key_file_remove_key(key_file, "General",
-                                               "ManufacturerData", NULL);
+                                               "LegacyManufacturerData", NULL);
                g_key_file_remove_key(key_file, "General",
-                                               "ManufacturerDataLen", NULL);
+                                               "LegacyManufacturerDataLen", NULL);
        }
 
        if (device->rpa) {
@@ -4308,8 +4308,8 @@ static const GDBusPropertyTable device_properties[] = {
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
         /* To handle Failed Legacy Pairing when initiated from Remote device*/
        { "LegacyPaired", "b", dev_property_get_paired },
-       { "ManufacturerDataLen", "q", property_get_manufacturer_data_len },
-       { "ManufacturerData", "ay", property_get_manufacturer_data },
+       { "LegacyManufacturerDataLen", "q", property_get_manufacturer_data_len },
+       { "LegacyManufacturerData", "ay", property_get_manufacturer_data },
        { "GattConnected", "b", dev_property_get_gatt_connected },
        { "PayloadTimeout", "q", dev_property_get_payload},
        { "LastAddrType", "y", dev_property_get_last_addr_type},
@@ -4686,7 +4686,7 @@ static void load_info(struct btd_device *device, const char *local,
        device->rpa_res_support = g_key_file_get_integer(key_file,
                                                        "General", "RPAResSupport", NULL);
 
-       str = g_key_file_get_string(key_file, "General", "ManufacturerDataLen", NULL);
+       str = g_key_file_get_string(key_file, "General", "LegacyManufacturerDataLen", NULL);
        if (str) {
                device->manufacturer_data_len = strtol(str, NULL, 10);
                g_free(str);
@@ -4697,7 +4697,7 @@ static void load_info(struct btd_device *device, const char *local,
                        device->manufacturer_data_len = 0;
                }
 
-               str = g_key_file_get_string(key_file, "General", "ManufacturerData", NULL);
+               str = g_key_file_get_string(key_file, "General", "LegacyManufacturerData", NULL);
                if (str) {
                        if (device->manufacturer_data_len < DEV_MAX_MANUFACTURER_DATA_LEN) {
                                load_manufacturer_data_2digit(str,
@@ -8797,10 +8797,10 @@ void device_set_manufacturer_info(struct btd_device *device, struct eir_data *ei
        store_device_info(device);
 
        g_dbus_emit_property_changed(dbus_conn, device->path,
-                                       DEVICE_INTERFACE, "ManufacturerDataLen");
+                                       DEVICE_INTERFACE, "LegacyManufacturerDataLen");
 
        g_dbus_emit_property_changed(dbus_conn, device->path,
-                                       DEVICE_INTERFACE, "ManufacturerData");
+                                       DEVICE_INTERFACE, "LegacyManufacturerData");
 }