Fix and update discriminant and payload values for plugin

Change-Id: Ia324e70804802667075f11d261b16509072844d7
Signed-off-by: Abhay agarwal <ay.agarwal@samsung.com>

diff --git a/packaging/ua-manager.spec b/packaging/ua-manager.spec
index 8abf1d9..4495daf 100644 (file)
--- a/packaging/ua-manager.spec
+++ b/packaging/ua-manager.spec
@@ -1,6 +1,6 @@
 Name:       ua-manager
 Summary:    User awareness manager
-Version:    0.6.3
+Version:    0.6.4
 Release:    1
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/ua-daemon/src/pm/ua-pm-util.c b/ua-daemon/src/pm/ua-pm-util.c
index f2f12f8..085e2d9 100644 (file)
--- a/ua-daemon/src/pm/ua-pm-util.c
+++ b/ua-daemon/src/pm/ua-pm-util.c
@@ -167,7 +167,6 @@ void _pm_util_uam_db_dev_to_uas_dev(unsigned int tech_type,
 
        (*device)->user_id = dev->user->user_id;
        (*device)->os = dev->os;
-       (*device)->discriminant = dev->discriminant;
        (*device)->device_id = g_strdup(dev->device_id);
 
        for (l = dev->tech_list; NULL != l; l = g_slist_next(l)) {
@@ -180,6 +179,7 @@ void _pm_util_uam_db_dev_to_uas_dev(unsigned int tech_type,
                if (tech_type != tech->tech_type)
                        continue;
 
+               (*device)->discriminant = tech->discriminant;
                (*device)->num_addr = g_slist_length(tech->addresses);
                (*device)->addr_list = g_new0(uas_address_info_t, (*device)->num_addr);
                for (l1 = tech->addresses; NULL != l1; l1 = g_slist_next(l1)) {
@@ -191,6 +191,12 @@ void _pm_util_uam_db_dev_to_uas_dev(unsigned int tech_type,
                        (*device)->addr_list[i].type = _pm_util_uam_addr_type_to_uas_addr_type(addr->addr_type);
                        (*device)->addr_list[i++].address = g_strdup(addr->address);
                }
+               (*device)->payload = g_new0(uas_ble_payload_t, 1);
+               (*device)->payload->service_id = tech->payload->service_id;
+               (*device)->payload->purpose = tech->payload->purpose;
+               (*device)->payload->device_icon = tech->payload->device_icon;
+               (*device)->payload->duid = g_memdup(tech->payload->duid, UAM_BLE_PAYLOAD_DUID_LEN);
+               (*device)->payload->bt_mac = g_memdup(tech->payload->bt_mac, UAM_BT_MAC_ADDRESS_STRING_LEN);
        }
 
        FUNC_EXIT;

diff --git a/ua-daemon/src/ua-manager-core.c b/ua-daemon/src/ua-manager-core.c
index e5e6e9f..44dc0ef 100644 (file)
--- a/ua-daemon/src/ua-manager-core.c
+++ b/ua-daemon/src/ua-manager-core.c
@@ -680,7 +680,7 @@ static void __uam_core_add_dev_to_list(
        tech->payload->purpose = dev_info->payload.purpose;
        tech->payload->device_icon = dev_info->payload.device_icon;
        tech->payload->duid = g_memdup(&(dev_info->payload.duid), UAM_BLE_PAYLOAD_DUID_LEN);
-       tech->payload->bt_mac = g_memdup(&(dev_info->payload.bt_mac), UAM_BLE_PAYLOAD_DUID_LEN);
+       tech->payload->bt_mac = g_memdup(&(dev_info->payload.bt_mac), UAM_BT_MAC_ADDRESS_STRING_LEN);
 
        tech->svc_list = svc_list;
        g_slist_foreach(tech->svc_list, __print_service, tech);