Set default values for payload
authorLokesh <l.kasana@samsung.com>
Tue, 5 Nov 2019 08:55:43 +0000 (14:25 +0530)
committersaerome.kim <saerome.kim@samsung.com>
Fri, 8 Nov 2019 10:56:35 +0000 (19:56 +0900)
Change-Id: I8115b980327bc043fba2a9338edc54cd80b8c416
Signed-off-by: Lokesh <l.kasana@samsung.com>
packaging/ua-manager.spec
ua-daemon/src/ua-manager-device-db.c

index bb512d7..5baaad6 100644 (file)
@@ -1,6 +1,6 @@
 Name:       ua-manager
 Summary:    User awareness manager
-Version:    0.12.9
+Version:    0.12.10
 Release:    1
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
index 02e8752..6305728 100644 (file)
@@ -568,14 +568,14 @@ int _uam_device_db_get_device(char *device_id, int tech_type, char *address,
                info->dev_info.discriminant = sqlite3_column_int(stmt, 8);
                memset(info->dev_info.payload.duid, 0, UAM_BLE_PAYLOAD_DUID_LEN + 1);
                buf = (char *)sqlite3_column_text(stmt, 9);
-               info->dev_info.payload.service_id = buf ? *buf : 0;
+               info->dev_info.payload.service_id = buf ? *buf : 13;
                buf = (char *)sqlite3_column_text(stmt, 10);
-               info->dev_info.payload.purpose = buf ? *buf : 0;
+               info->dev_info.payload.purpose = buf ? *buf : 1;
                if ((char*)sqlite3_column_text(stmt, 11))
                        memcpy(info->dev_info.payload.duid, (char *)sqlite3_column_text(stmt, 11),
                                UAM_BLE_PAYLOAD_DUID_LEN);
                buf = (char *)sqlite3_column_text(stmt, 12);
-               info->dev_info.payload.device_icon = buf ? *buf : 0;
+               info->dev_info.payload.device_icon = buf ? *buf : 1;
 
                UAM_INFO("%s-%d-%s-%s-%llu-%d-%d-%d-%d-0x%2.2X",
                        info->dev_info.device_id,
@@ -671,14 +671,14 @@ GSList *_uam_device_db_get_all_devices(void)
                        info->dev_info.discriminant = sqlite3_column_int(stmt, 8);
                        memset(info->dev_info.payload.duid, 0, UAM_BLE_PAYLOAD_DUID_LEN + 1);
                        buf = (char *)sqlite3_column_text(stmt, 9);
-                       info->dev_info.payload.service_id = buf ? *buf : 0;
+                       info->dev_info.payload.service_id = buf ? *buf : 13;
                        buf = (char *)sqlite3_column_text(stmt, 10);
-                       info->dev_info.payload.purpose = buf ? *buf : 0;
+                       info->dev_info.payload.purpose = buf ? *buf : 1;
                        if ((char*)sqlite3_column_text(stmt, 11))
                                memcpy(info->dev_info.payload.duid, (char *)sqlite3_column_text(stmt, 11),
                                        UAM_BLE_PAYLOAD_DUID_LEN);
                        buf = (char *)sqlite3_column_text(stmt, 12);
-                       info->dev_info.payload.device_icon = buf ? *buf : 0;
+                       info->dev_info.payload.device_icon = buf ? *buf : 1;
 
                        UAM_INFO("%s-%d-%s-%s-%llu-%d-%d-%d-%d-0x%2.2X",
                                info->dev_info.device_id,