Fix for Web/C# TCT fail

- Change logic to get focused app pid

Change-Id: Ic8a176bfdf2d662a324130754ec15f844e8fd86a
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>

diff --git a/include/nfc_common.h b/include/nfc_common.h
index fc49bbd..0639d68 100644 (file)
--- a/include/nfc_common.h
+++ b/include/nfc_common.h
@@ -26,6 +26,7 @@
 #include <system_info.h>
 #include <systemd/sd-login.h>
 #include <aul.h>
+#include <aul_window.h>
 
 #include "net_nfc.h"
 #include "nfc.h"

diff --git a/src/nfc_common.c b/src/nfc_common.c
index 87413d5..6040e0b 100755 (executable)
--- a/src/nfc_common.c
+++ b/src/nfc_common.c
@@ -19,83 +19,17 @@
 _nfc_context_s gdbus_nfc_context;
 
 /* LCOV_EXCL_START */
-bool nfc_common_get_login_user(uid_t *uid)
-{
-       int i, ret;
-       uid_t *uids;
-       int uid_count;
-
-       uid_count = sd_get_uids(&uids);
-
-       if (uid_count <= 0) {
-               LOGD("sd_get_uids failed [%d]", uid_count);
-               return false;
-       }
-
-       for (i = 0; i < uid_count ; i++) {
-               char *state = NULL;
-
-               ret = sd_uid_get_state(uids[i], &state);
-
-               if (ret < 0) {
-                       LOGD("sd_uid_get_state failed [%d]", ret);
-               } else {
-                       if (!strncmp(state, "online", 6)) {
-                               *uid = uids[i];
-                               free(state);
-                               free(uids);
-                               return true;
-                       }
-               }
-
-               free(state);
-       }
-
-       LOGD("not exist login user");
-
-       free(uids);
-       return false;
-}
-
-int _iter_func(const aul_app_info *info, void *data)
-{
-       uid_t uid = 0;
-       int *pid = (int *)data;
-       int status;
-
-       if (nfc_common_get_login_user(&uid) == false) {
-               LOGD("net_nfc_util_get_login_user is failed");
-               return 0;
-       }
-
-       status = aul_app_get_status_bypid_for_uid(info->pid, uid);
-
-       LOGD("login user is %d, pid is %d, status is %d", (int)uid, info->pid, status);
-
-       if (status == STATUS_VISIBLE || status == STATUS_FOCUS) {
-               *pid = info->pid;
-               return -1;
-       }
-       return 0;
-}
-
 pid_t nfc_common_get_focus_app_pid()
 {
        int ret;
-       uid_t uid = 0;
        pid_t pid = 0;
 
-       if (nfc_common_get_login_user(&uid) == false) {
-               LOGD("nfc_common_get_login_user is failed");
-               return -1;
-       }
-
-       ret = aul_app_get_all_running_app_info_for_uid(_iter_func, &pid, uid);
+       ret = aul_window_get_focused_pid(&pid);
 
        if (ret == AUL_R_OK) {
                return pid;
        } else {
-               LOGD("aul_app_get_all_running_app_info_for_uid is failed");
+               LOGD("aul_window_get_focused_pid is failed");
                return -1;
        }
 }