[Fix] Compare mac in device list only when device id matches

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

diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec
index 2e65157d72b42d0f8043633cc84eef86179b72e3..6d4171ef1f91f23bc96da4c5f84fc3edfc97ade6 100644 (file)
--- a/packaging/capi-network-ua.spec
+++ b/packaging/capi-network-ua.spec
@@ -1,6 +1,6 @@
 Name: capi-network-ua
 Summary: User Awareness Framework CAPI
-Version: 0.7.0
+Version: 0.7.1
 Release: 1
 License: Apache-2.0
 Source0: %{name}-%{version}.tar.gz

diff --git a/src/user-awareness-device.c b/src/user-awareness-device.c
index fd39e28e4df6c05a4d2966f614833d347fff2386..5c0e4f7a114cfc1b6a86c2728824a87359f64edc 100644 (file)
--- a/src/user-awareness-device.c
+++ b/src/user-awareness-device.c
@@ -41,12 +41,12 @@ static ua_dev_info_s *__ua_get_device_from_list(const char *device_id,
                        continue;
 
                if (device_id && !g_strcmp0(device_id, dev->device_id)) {
-                       UA_INFO("Device found, device id[%s]", dev->device_id);
-                       return dev;
-               }
+                       UA_INFO("Device ID found, device id[%s]", dev->device_id);
 
-               if (mac && !g_strcmp0(mac, dev->mac)) {
-                       UA_INFO("Device found, mac address[%s]", dev->mac);
+                       if (mac && !g_strcmp0(mac, dev->mac)) {
+                               UA_INFO("Device found, mac address[%s]", dev->mac);
+                               return dev;
+                       }
                        return dev;
                }
        }