summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLokesh <l.kasana@samsung.com>2019-07-23 13:09:13 +0530
committersaerome.kim <saerome.kim@samsung.com>2019-07-23 20:40:17 +0900
commit083b2a826b05f0dd475f468f83c751b25e989a6e (patch)
tree862265c2d86950460f4e122822c67e4afa2c9a4e
parent1e61cf6808b179f529ddfacdb38a2d1cbb3a868e (diff)
downloaduser-awareness-083b2a826b05f0dd475f468f83c751b25e989a6e.tar.gz
user-awareness-083b2a826b05f0dd475f468f83c751b25e989a6e.tar.bz2
user-awareness-083b2a826b05f0dd475f468f83c751b25e989a6e.zip
No need to find and fill device_info->user in ua_service_foreach_added_devices()
To reduce d-bus calls Change-Id: I65d9fb5867c3603fb91f40b5633054206f29fabf Signed-off-by: Lokesh <l.kasana@samsung.com>
-rw-r--r--src/user-awareness-service.c36
1 files changed, 1 insertions, 35 deletions
diff --git a/src/user-awareness-service.c b/src/user-awareness-service.c
index 0b59d8a..13d3e7e 100644
--- a/src/user-awareness-service.c
+++ b/src/user-awareness-service.c
@@ -633,7 +633,6 @@ int ua_service_foreach_added_devices(
ua_service_info_s *service = (ua_service_info_s *)service_handle;
GPtrArray *devices_list = NULL;
uam_device_info_s *ptr;
- uam_user_info_s uam_user;
UA_VALIDATE_INPUT_PARAMETER(foreach_cb);
UA_VALIDATE_INPUT_PARAMETER(service_handle);
@@ -690,40 +689,7 @@ int ua_service_foreach_added_devices(
device_info->handle = (ua_device_h)device_info;
device_info->type = __to_ua_mac_type(ptr->type);
device_info->os = ptr->operating_system;
-
- if (!device_info->user) {
-// TODO lk, already getting service foreach user info here. why need service foreach user
- ret = _ua_get_error_code(_uam_request_get_user_by_deviceid(device_info->mobile_id, &uam_user));
- if (UA_ERROR_NONE != ret) {
- UA_ERR("Failed with error: %s(0x%X)",
- _ua_get_error_string(ret), ret);
- _ua_free_ua_device_info_t((gpointer)device_info);
- goto done;
- } else {
- GSList *l;
- ua_user_info_s *user_info;
- GSList *ua_users_list = _ua_user_get_users();
- int found = 0;
-
- for (l = ua_users_list; l; l = g_slist_next(l)) {
- user_info = (ua_user_info_s *)l->data;
-
- if (!g_strcmp0(uam_user.account, user_info->account)) {
- UA_INFO("User found [%s]", user_info->account);
- device_info->user = (ua_user_h)user_info;
- found = 1;
- break;
- }
- }
-
- if (!found)
- UA_ERR("User not found [%s]", uam_user.account);
- else
- UA_ERR("User found [%s]", uam_user.account);
-
- }
- } else
- UA_INFO("user handle is already present!");
+ device_info->user = NULL;
if (!foreach_cb(service->service_handle, device_info->handle, user_data)) {
_ua_free_ua_device_info_t(device_info);