Fix build warning based on GCC-9
[platform/core/appfw/libeventsystem.git] / src / eventsystem.c
index 4ed3904..7c4d4ec 100644 (file)
 #define VALID_LAST_COUNT_FOR_EVENTNAME (VALID_COUNT_OF_EVENTNAME_TOKEN + 1)
 #define MAX_COUNT_FOR_EVENTNAME_CHECK (VALID_LAST_COUNT_FOR_EVENTNAME + 1)
 
+#define FREE_AND_NULL(ptr) do { \
+       if (ptr) { \
+               free((void *)ptr); \
+               ptr = NULL; \
+       } \
+} while (0)
+
 #define _E(fmt, arg...) LOGE(fmt, ##arg)
 #define _D(fmt, arg...) LOGD(fmt, ##arg)
 #define _W(fmt, arg...) LOGW(fmt, ##arg)
@@ -57,6 +64,13 @@ static GList *system_event_list;
 static int _initialized;
 static GHashTable *check_tbl;
 static GHashTable *filter_tbl;
+static GHashTable *last_data_tbl;
+
+struct last_data_item {
+       char *event_name;
+       GVariant *param;
+       GVariant *trusted_param;
+};
 
 typedef struct eventmap {
        char *event_name;
@@ -69,6 +83,7 @@ typedef struct eventmap {
                eventsystem_cb es_cb;
                eventsystem_handler ep_cb;
        };
+       void *user_data;
 } eventmap_s;
 
 typedef struct eventinfo {
@@ -78,6 +93,7 @@ typedef struct eventinfo {
        char *object_path;
        char *member_name;
        bool is_user_event;
+       bool is_trusted;
        bundle *event_data;
 } eventinfo_s;
 
@@ -90,17 +106,15 @@ typedef struct sysevent_info {
 static sysevent_info_s s_info;
 
 static int __eventsystem_check_user_send_validation(const char *event_name);
-static int __eventsystem_requet_destination_list(const char *event_name, GList **dest_list);
+static int __eventsystem_request_destination_list(const char *event_name, GList **dest_list);
 static int __eventsystem_check_sender_validation(int sender_pid,
                const char *event_name, char **sender);
-
-static int __event_compare_name_cb(gconstpointer a, gconstpointer b)
-{
-       eventmap_s *key1 = (eventmap_s *)a;
-       eventmap_s *key2 = (eventmap_s *)b;
-       return strcmp(key1->interface_name, key2->interface_name) |
-                       strcmp(key1->member_name, key2->member_name);
-}
+static eventmap_s *__create_eventmap(const char *interface_name,
+               const char *member_name, const char *event_name,
+               int event_type, eventsystem_cb callback, void *user_data);
+static void __destroy_eventmap(gpointer data);
+static int __eventsystem_launch_on_event_for_userevent(const char *event_name,
+               bundle *data, gboolean trusted);
 
 static int __event_compare_reg_id_cb(gconstpointer a, gconstpointer b)
 {
@@ -160,7 +174,7 @@ out:
 static char *__get_object_path(char *interface_name)
 {
        int i;
-       char *object_path = (char *)calloc(strlen(interface_name), sizeof(char)+2);
+       char *object_path = (char *)calloc(strlen(interface_name), sizeof(char) + 2);
 
        if (object_path == NULL) {
                _E("failed to allocate memory");
@@ -169,13 +183,11 @@ static char *__get_object_path(char *interface_name)
 
        object_path[0] = '/';
 
-       for (i = 0 ; interface_name[i] ; i++) {
-
-               if (interface_name[i] == '.') {
-                       object_path[i+1] = '/';
-               } else {
-                       object_path[i+1] = interface_name[i];
-               }
+       for (i = 0; interface_name[i]; i++) {
+               if (interface_name[i] == '.')
+                       object_path[i + 1] = '/';
+               else
+                       object_path[i + 1] = interface_name[i];
        }
 
        return object_path;
@@ -237,10 +249,10 @@ static char *__get_member_name_from_eventname(char *event_name)
                ptr_last = ptr;
                count++;
        }
-       FREE_AND_NULL(temp_name);
 
        if (count != VALID_LAST_COUNT_FOR_EVENTNAME) {
                _E("invalid event_name(%s), count(%d)", event_name, count);
+               FREE_AND_NULL(temp_name);
                return NULL;
        }
 
@@ -249,15 +261,18 @@ static char *__get_member_name_from_eventname(char *event_name)
                member_name = strdup(ptr_last);
                if (!member_name) {
                        _E("out_of_memory");
+                       FREE_AND_NULL(temp_name);
                        return NULL;
                }
        } else {
                _E("ptr_last is NULL");
+               FREE_AND_NULL(temp_name);
                return NULL;
        }
 
        _D("member_name(%s)", member_name);
 
+       FREE_AND_NULL(temp_name);
        return member_name;
 }
 
@@ -282,6 +297,7 @@ static int __check_validation_usrevent_sender(int sender_pid,
        key = strdup(interface_name);
        if (key == NULL) {
                _E("out of memory");
+               g_free(sender_id);
                return ES_R_ENOMEM;
        }
 
@@ -289,10 +305,12 @@ static int __check_validation_usrevent_sender(int sender_pid,
        if (val == NULL) {
                _E("out of memory");
                free(key);
+               g_free(sender_id);
                return ES_R_ENOMEM;
        }
 
        g_hash_table_insert(filter_tbl, key, val);
+       g_free(sender_id);
 
        return ES_R_OK;
 }
@@ -303,12 +321,10 @@ static int __check_validation_user_defined_name(const char *event_name)
        char *key = NULL;
        int ret = 1;
 
-       if (check_tbl == NULL) {
+       if (check_tbl == NULL)
                check_tbl = g_hash_table_new(g_str_hash, g_str_equal);
-       }
 
        event_id = (char *)g_hash_table_lookup(check_tbl, event_name);
-
        if (event_id == NULL) {
                if (__eventsystem_check_user_send_validation(event_name) < 0) {
                        _E("invalid user-event name");
@@ -329,38 +345,32 @@ static int __check_validation_user_defined_name(const char *event_name)
 
 static int __check_interface_validation_user(char *interface_name)
 {
-       int ret = 1;
        int len = strlen(EVENT_SYSTEM_PREFIX);
 
-       if (strncmp(interface_name, EVENT_SYSTEM_PREFIX, len) != 0) {
-               ret = 0;
-       }
+       if (strncmp(interface_name, EVENT_SYSTEM_PREFIX, len) != 0)
+               return 0;
 
-       return ret;
+       return 1;
 }
 
 static int __check_eventname_validation_user(char *event_name)
 {
-       int ret = 1;
        int len = strlen(USER_EVENT_NAME_PREFIX);
 
-       if (strncmp(event_name, USER_EVENT_NAME_PREFIX, len) != 0) {
-               ret = 0;
-       }
+       if (strncmp(event_name, USER_EVENT_NAME_PREFIX, len) != 0)
+               return 0;
 
-       return ret;
+       return 1;
 }
 
 static int __check_eventname_validation_system(char *event_name)
 {
-       int ret = 1;
        int len = strlen(SYS_EVENT_NAME_PREFIX);
 
-       if (strncmp(event_name, SYS_EVENT_NAME_PREFIX, len) != 0) {
-               ret = 0;
-       }
+       if (strncmp(event_name, SYS_EVENT_NAME_PREFIX, len) != 0)
+               return 0;
 
-       return ret;
+       return 1;
 }
 
 static int __get_gdbus_shared_connection(GDBusConnection **connection, GBusType bus_type,
@@ -368,10 +378,12 @@ static int __get_gdbus_shared_connection(GDBusConnection **connection, GBusType
 {
        GError *error = NULL;
        guint owner_id = 0;
+       gchar *guid = NULL;
+       char own_name[128] = {0, };
+       GDBusConnection *conn_system = NULL;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        *connection = g_bus_get_sync(bus_type, NULL, &error);
        if (*connection == NULL) {
@@ -385,17 +397,14 @@ static int __get_gdbus_shared_connection(GDBusConnection **connection, GBusType
 
        if (((bus_type == G_BUS_TYPE_SYSTEM && !s_info.owner_id) ||
                (bus_type == G_BUS_TYPE_SESSION && !s_info.owner_id_session))) {
-               gchar *guid = NULL;
-               char own_name[128] = {0, };
-
                guid = g_dbus_generate_guid();
                if (guid == NULL) {
                        _E("failed to get guid");
                        return ES_R_ERROR;
                }
-               snprintf(own_name, 128, "%s_%s_%s_%d", "event.busname",
+               snprintf(own_name, 128, "%s.%s.id%s_%d_%d", "event.busname",
                        (bus_type == G_BUS_TYPE_SESSION ? "session" : "system"),
-                       guid, getpid());
+                       guid, getuid(), getpid());
                g_free(guid);
 
                _D("bus_name is [%s]", own_name);
@@ -409,8 +418,6 @@ static int __get_gdbus_shared_connection(GDBusConnection **connection, GBusType
 
                if (bus_type == G_BUS_TYPE_SESSION && event_type == ES_TYPE_USER) {
                        /* set same name on system-bus */
-                       GDBusConnection *conn_system = NULL;
-
                        error = NULL;
                        conn_system = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error);
                        if (conn_system == NULL) {
@@ -460,32 +467,29 @@ static void __eventsystem_event_handler(GDBusConnection *connection,
                GVariant *parameters, gpointer user_data)
 {
        int len;
-       eventmap_s em;
+       eventmap_s *em = (eventmap_s *)user_data;
        GList *cb_list = NULL;
        bundle *buf = NULL;
        bundle_raw *raw = NULL;
 
-       em.interface_name = (char *)interface_name;
-       em.member_name = (char *)signal_name;
+       if (!em) {
+               _E("Critical error!");
+               return;
+       }
 
        _D("sender_name(%s), interface_name(%s), signal_name(%s)",
                sender_name, interface_name, signal_name);
 
-       cb_list = g_list_find_custom(system_event_list, &em,
-               (GCompareFunc)__event_compare_name_cb);
-       if (cb_list == NULL) {
+       cb_list = g_list_find(system_event_list, em);
+       if (cb_list == NULL)
                return;
-       }
 
        g_variant_get(parameters, "(us)", &len, &raw);
 
        buf = bundle_decode((bundle_raw *)raw, len);
 
-       em.event_name = ((eventmap_s *)cb_list->data)->event_name;
-       em.ep_cb = ((eventmap_s *)cb_list->data)->ep_cb;
-       if (em.ep_cb) {
-               em.ep_cb(em.event_name, buf, user_data);
-       }
+       if (em->ep_cb)
+               em->ep_cb(em->event_name, buf, em->user_data);
 
        bundle_free_encoded_rawdata(&raw);
        bundle_free(buf);
@@ -495,37 +499,33 @@ static void __eventsystem_application_event_handler(int sender_pid,
                const gchar *interface_name, const gchar *signal_name,
                GVariant *parameters, gpointer user_data)
 {
-       GList *cb_list = NULL;
-       eventmap_s em;
+       GList *cb_list;
+       eventmap_s *em = (eventmap_s *)user_data;
        bundle_raw *raw = NULL;
        int len;
 
-       em.interface_name = (char *)interface_name;
-       em.member_name = (char *)signal_name;
-
-       cb_list = g_list_find_custom(system_event_list, &em,
-               (GCompareFunc)__event_compare_name_cb);
+       if (!em) {
+               _E("Critical error!");
+               return;
+       }
 
+       cb_list = g_list_find(system_event_list, em);
        if (cb_list == NULL) {
                _E("not interested event");
                return;
        }
 
-       em.event_name = ((eventmap_s *)cb_list->data)->event_name;
-
        if (sender_pid > 0 && __check_interface_validation_user((char *)interface_name)) {
                if (__check_validation_usrevent_sender(sender_pid,
-                       (const char *)interface_name, em.event_name) < 0) {
+                       (const char *)interface_name, em->event_name) < 0) {
                        _E("invalid sender");
                        return;
                }
        }
 
        g_variant_get(parameters, "(us)", &len, &raw);
-       em.es_cb = ((eventmap_s *)cb_list->data)->es_cb;
-       if (em.es_cb) {
-               em.es_cb(em.event_name, raw, len, user_data);
-       }
+       if (em->es_cb)
+               em->es_cb(em->event_name, raw, len, em->user_data);
 
        bundle_free_encoded_rawdata(&raw);
 }
@@ -543,12 +543,10 @@ static void __eventsystem_filter_userevent_for_application(GDBusConnection *conn
 
        _D("sender_name(%s), interface_name(%s)", sender_name, interface_name);
 
-       if (filter_tbl == NULL) {
+       if (filter_tbl == NULL)
                filter_tbl = g_hash_table_new(g_str_hash, g_str_equal);
-       }
 
        sender_id = (char *)g_hash_table_lookup(filter_tbl, interface_name);
-
        if (sender_id == NULL) {
                sender_pid = __eventsystem_get_sender_pid(connection, sender_name);
                if (sender_pid <= 0) {
@@ -609,11 +607,10 @@ static void __eventsystem_filter_sysevent_for_internal(GDBusConnection *connecti
 static int __eventsystem_register_event_internal(const char *event_name,
                eventmap_s **em_s, void *user_data)
 {
-       eventmap_s *em = NULL;
-       char *interface_name = NULL;
-       char *object_path = NULL;
-       char *member_name = NULL;
-       char *sender_name = NULL;
+       eventmap_s *em;
+       char *interface_name;
+       char *object_path;
+       char *member_name;
        GDBusSignalCallback filter;
        GBusType bus_type;
        guint subscription_id = 0;
@@ -679,7 +676,6 @@ static int __eventsystem_register_event_internal(const char *event_name,
                ret = ES_R_ERROR;
                goto out_3;
        }
-       sender_name = NULL;
 
        bus_type = G_BUS_TYPE_SYSTEM;
 
@@ -688,15 +684,22 @@ static int __eventsystem_register_event_internal(const char *event_name,
                goto out_4;
        }
 
+       em = __create_eventmap(interface_name, member_name, event_name,
+                       evt_type, NULL, user_data);
+       if (!em) {
+               ret = ES_R_ENOMEM;
+               goto out_4;
+       }
+
        subscription_id = g_dbus_connection_signal_subscribe(conn,
-               sender_name, /* sender */
+               NULL, /* sender */
                interface_name,
                member_name, /* member */
                object_path, /* object_path */
                NULL, /* arg0 */
                G_DBUS_SIGNAL_FLAGS_NONE,
                filter,
-               user_data,
+               em,
                NULL); /* user_data_free_func */
 
        _D("event_name(%s), interface_name(%s)", event_name, interface_name);
@@ -704,33 +707,14 @@ static int __eventsystem_register_event_internal(const char *event_name,
                member_name, subscription_id, bus_type);
 
        if (subscription_id != 0) {
-               em = calloc(1, sizeof(eventmap_s));
-               if (!em) {
-                       _E("memory alloc failed");
-                       ret = ES_R_ENOMEM;
-               } else {
-                       em->interface_name = strdup(interface_name);
-                       em->member_name = strdup(member_name);
-                       em->event_name = strdup(event_name);
-                       em->bus_type = bus_type;
-                       em->reg_id = subscription_id;
-                       em->event_type = evt_type;
-
-                       if (!em->interface_name || !em->member_name || !em->event_name) {
-                               _E("out_of_memory");
-                               FREE_AND_NULL(em->interface_name);
-                               FREE_AND_NULL(em->member_name);
-                               FREE_AND_NULL(em->event_name);
-                               FREE_AND_NULL(em);
-                               ret = ES_R_ENOMEM;
-                               goto out_4;
-                       }
+               em->bus_type = bus_type;
+               em->reg_id = subscription_id;
 
-                       *em_s = em;
-                       ret = ES_R_OK;
-               }
+               *em_s = em;
+               ret = ES_R_OK;
        } else {
                _D("dbus subscribe: error(%d), event(%s)", subscription_id, event_name);
+               __destroy_eventmap(em);
                ret = ES_R_ERROR;
        }
 
@@ -741,9 +725,8 @@ out_3:
 out_2:
        FREE_AND_NULL(interface_name);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -762,19 +745,17 @@ int eventsystem_register_event(const char *event_name, unsigned int *reg_id,
        retvm_if(!reg_id, ES_R_EINVAL, "Invalid argument : reg_id");
        retvm_if(!callback, ES_R_EINVAL, "Invalid argument : callback");
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        ret = __eventsystem_register_event_internal(event_name, &em, user_data);
-
        if (ret == ES_R_OK && em) {
                em->ep_cb = callback;
                system_event_list = g_list_append(system_event_list, em);
                *reg_id = em->reg_id;
                ret = ES_R_OK;
        } else {
-               _E("error, ret(%d), em(%s)", ret, em);
+               _E("error, ret(%d), event_name(%s)", ret, event_name);
        }
 
        return ret;
@@ -794,9 +775,8 @@ int eventsystem_unregister_event(unsigned int reg_id)
 
        retvm_if(reg_id == 0, ES_R_EINVAL, "Invalid argument : reg_id");
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        em.reg_id = reg_id;
        cb_list = g_list_find_custom(system_event_list, &em,
@@ -817,10 +797,7 @@ int eventsystem_unregister_event(unsigned int reg_id)
 
                system_event_list = g_list_remove(system_event_list, cb_list->data);
 
-               FREE_AND_NULL(em_data->interface_name);
-               FREE_AND_NULL(em_data->member_name);
-               FREE_AND_NULL(em_data->event_name);
-               FREE_AND_NULL(em_data);
+               __destroy_eventmap(em_data);
                g_object_unref(conn);
        }
 
@@ -875,12 +852,13 @@ static int __eventsystem_send_trusted_event(GDBusConnection *conn, eventinfo_s *
 {
        GList *tmp_list = NULL;
        int ret = 0;
+       char *dest_name;
 
        if (dest_list) {
                tmp_list = g_list_first(dest_list);
 
                while (tmp_list != NULL) {
-                       char *dest_name = (char *)tmp_list->data;
+                       dest_name = (char *)tmp_list->data;
                        if (dest_name && dest_name[0] != '\0') {
                                _D("dest_name(%s)", dest_name);
                                evti->destination_name = dest_name;
@@ -893,7 +871,6 @@ static int __eventsystem_send_trusted_event(GDBusConnection *conn, eventinfo_s *
                        }
                        tmp_list = g_list_next(tmp_list);
                }
-               g_list_free_full(dest_list, __eventsystem_free_trusted_list);
        } else {
                _E("dest_list is null");
        }
@@ -906,7 +883,13 @@ static int __eventsystem_send_trusted_event(GDBusConnection *conn, eventinfo_s *
  */
 int eventsystem_send_user_event(const char *event_name, bundle *data, bool is_trusted)
 {
-       int ret = 0;
+       int ret = ES_R_OK;
+       eventinfo_s *evti = NULL;
+       struct last_data_item *item;
+       bundle_raw *raw = NULL;
+       int len;
+       GDBusConnection *conn = NULL;
+       GList *trusted_dest_list = NULL;
 
        /* check validation */
        retvm_if(!event_name, ES_R_EINVAL, "Invalid argument : event_name is NULL");
@@ -919,7 +902,6 @@ int eventsystem_send_user_event(const char *event_name, bundle *data, bool is_tr
                return ES_R_EINVAL;
        }
 
-       eventinfo_s *evti = NULL;
        evti = calloc(1, sizeof(eventinfo_s));
        if (!evti) {
                _E("memory alloc failed");
@@ -929,63 +911,93 @@ int eventsystem_send_user_event(const char *event_name, bundle *data, bool is_tr
        if (!evti->event_name) {
                _E("memory alloc failed");
                ret = ES_R_ENOMEM;
-               goto out_1;
+               goto out;
        }
 
        evti->interface_name = __get_encoded_interface_name(evti->event_name);
        if (!evti->interface_name) {
                _E("interface_name is NULL");
                ret = ES_R_ERROR;
-               goto out_2;
+               goto out;
        }
        evti->member_name = strdup(EVENT_SYSTEM_MEMBER);
        if (!evti->member_name) {
                _E("memory alloc failed");
                ret = ES_R_ENOMEM;
-               goto out_3;
+               goto out;
        }
 
        evti->object_path = __get_object_path(evti->interface_name);
        if (!evti->object_path) {
                _E("object_path is NULL");
                ret = ES_R_ERROR;
-               goto out_4;
+               goto out;
        }
 
        evti->destination_name = NULL;
        evti->is_user_event = true;
+       evti->is_trusted = is_trusted;
 
-       GDBusConnection *conn = NULL;
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SESSION, ES_TYPE_USER) == ES_R_OK) {
+               if (bundle_encode(data, &raw, &len)) {
+                       _E("Unable to encode bundle");
+                       ret = ES_R_ERROR;
+                       goto out;
+               }
+
+               item = (struct last_data_item *)g_hash_table_lookup(last_data_tbl,
+                               evti->event_name);
+               if (item) {
+                       if (!evti->is_trusted) {
+                               if (item->param)
+                                       g_variant_unref(item->param);
+                               item->param = g_variant_new("(us)", len, raw);
+                       }
+                       if (item->trusted_param)
+                               g_variant_unref(item->trusted_param);
+                       item->trusted_param = g_variant_new("(us)", len, raw);
+               }
+
+               bundle_free_encoded_rawdata(&raw);
+
                if (is_trusted) {
-                       GList *dest_list = NULL;
-                       ret = __eventsystem_requet_destination_list(evti->event_name, &dest_list);
-                       if (ret < 0) {
+                       if (__eventsystem_request_destination_list(evti->event_name, &trusted_dest_list) < 0) {
                                _E("failed to get dest list");
                                ret = ES_R_ERROR;
-                       } else {
-                               ret = __eventsystem_send_trusted_event(conn, evti,
-                                       data, dest_list);
+                               goto out;
+                       }
+                       if (__eventsystem_send_trusted_event(conn, evti, data, trusted_dest_list) < 0) {
+                               _E("failed to send trusted event");
+                               ret = ES_R_ERROR;
+                               goto out;
                        }
+
+                       if (__eventsystem_launch_on_event_for_userevent(evti->event_name, data, TRUE) < 0)
+                               _E("Failed to launch on event for userevent");
                } else {
-                       ret = __eventsystem_send_event(conn, evti, data);
+                       if (__eventsystem_send_event(conn, evti, data) < 0) {
+                               _E("failed to send event");
+                               ret = ES_R_ERROR;
+                               goto out;
+                       }
+
+                       if (__eventsystem_launch_on_event_for_userevent(evti->event_name, data, FALSE) < 0)
+                               _E("Failed to launch on event for userevent");
                }
        } else {
                _E("getting gdbus-connetion error");
                ret = ES_R_ERROR;
        }
 
-       if (conn) {
+out:
+       if (conn)
                g_object_unref(conn);
-       }
+       if (trusted_dest_list)
+       g_list_free_full(trusted_dest_list, __eventsystem_free_trusted_list);
        FREE_AND_NULL(evti->object_path);
-out_4:
        FREE_AND_NULL(evti->member_name);
-out_3:
        FREE_AND_NULL(evti->interface_name);
-out_2:
        FREE_AND_NULL(evti->event_name);
-out_1:
        FREE_AND_NULL(evti);
 
        return ret;
@@ -997,6 +1009,8 @@ out_1:
 int eventsystem_send_system_event(const char *event_name, bundle *data)
 {
        int ret = 0;
+       eventinfo_s *evti = NULL;
+       GDBusConnection *conn = NULL;
 
        pthread_mutex_lock(&send_sync_lock);
 
@@ -1010,7 +1024,6 @@ int eventsystem_send_system_event(const char *event_name, bundle *data)
 
        _D("event_name(%s)", event_name);
 
-       eventinfo_s *evti = NULL;
        evti = calloc(1, sizeof(eventinfo_s));
        if (!evti) {
                _E("memory alloc failed");
@@ -1049,7 +1062,6 @@ int eventsystem_send_system_event(const char *event_name, bundle *data)
        evti->destination_name = NULL;
        evti->is_user_event = false;
 
-       GDBusConnection *conn = NULL;
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) == ES_R_OK) {
                ret = __eventsystem_send_event(conn, evti, data);
        } else {
@@ -1057,9 +1069,9 @@ int eventsystem_send_system_event(const char *event_name, bundle *data)
                ret = ES_R_ERROR;
        }
 
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
+
        FREE_AND_NULL(evti->object_path);
 out_4:
        FREE_AND_NULL(evti->member_name);
@@ -1093,9 +1105,8 @@ int eventsystem_request_sending_system_event(const char *event_name, bundle *dat
 
        _D("event_name(%s)", event_name);
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
@@ -1104,7 +1115,7 @@ int eventsystem_request_sending_system_event(const char *event_name, bundle *dat
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1133,11 +1144,11 @@ int eventsystem_request_sending_system_event(const char *event_name, bundle *dat
        ret = ES_R_OK;
 
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -1153,9 +1164,8 @@ static int __eventsystem_check_sender_validation(int sender_pid, const char *eve
        GVariant *value = NULL;
        gint result = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
@@ -1164,7 +1174,7 @@ static int __eventsystem_check_sender_validation(int sender_pid, const char *eve
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1188,15 +1198,14 @@ static int __eventsystem_check_sender_validation(int sender_pid, const char *eve
 
        _D("result(%d)", result);
 
-       if (result == 1) {
+       if (result == 1)
                ret = ES_R_OK;
-       }
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -1211,9 +1220,8 @@ static int __eventsystem_check_user_send_validation(const char *event_name)
        GVariant *value = NULL;
        gint result = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
@@ -1222,7 +1230,7 @@ static int __eventsystem_check_user_send_validation(const char *event_name)
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1246,15 +1254,14 @@ static int __eventsystem_check_user_send_validation(const char *event_name)
 
        _D("result(%d)", result);
 
-       if (result == 1) {
+       if (result == 1)
                ret = ES_R_OK;
-       }
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -1269,9 +1276,8 @@ static int __eventsystem_check_privilege_validation(const char *event_name)
        GVariant *value = NULL;
        gint result = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
@@ -1280,7 +1286,7 @@ static int __eventsystem_check_privilege_validation(const char *event_name)
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1304,15 +1310,14 @@ static int __eventsystem_check_privilege_validation(const char *event_name)
 
        _D("result(%d)", result);
 
-       if (result == 1) {
+       if (result == 1)
                ret = ES_R_OK;
-       }
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -1327,9 +1332,8 @@ static int __eventsystem_setup_trusted_peer(const char *event_name, const char *
        GVariant *value = NULL;
        gint result = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
@@ -1338,7 +1342,7 @@ static int __eventsystem_setup_trusted_peer(const char *event_name, const char *
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1349,7 +1353,6 @@ static int __eventsystem_setup_trusted_peer(const char *event_name, const char *
        }
 
        param = g_variant_new("(ss)", event_name, dest_bus_name);
-
        value = g_dbus_proxy_call_sync(proxy, "SetupTrustedPeer", param,
                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error != NULL) {
@@ -1363,20 +1366,19 @@ static int __eventsystem_setup_trusted_peer(const char *event_name, const char *
 
        _D("result(%d)", result);
 
-       if (result == 1) {
+       if (result == 1)
                ret = ES_R_OK;
-       }
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
 
-static int __eventsystem_requet_destination_list(const char *event_name, GList **dest_list)
+static int __eventsystem_request_destination_list(const char *event_name, GList **dest_list)
 {
        int ret = ES_R_ERROR;
        GDBusConnection *conn = NULL;
@@ -1389,9 +1391,8 @@ static int __eventsystem_requet_destination_list(const char *event_name, GList *
        char *dest_name = NULL;
        gint result = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
@@ -1400,7 +1401,7 @@ static int __eventsystem_requet_destination_list(const char *event_name, GList *
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
        if (proxy == NULL) {
@@ -1411,7 +1412,6 @@ static int __eventsystem_requet_destination_list(const char *event_name, GList *
        }
 
        param = g_variant_new("(s)", event_name);
-
        value = g_dbus_proxy_call_sync(proxy, "GetTrustedPeerList", param,
                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error != NULL) {
@@ -1442,11 +1442,11 @@ static int __eventsystem_requet_destination_list(const char *event_name, GList *
        g_variant_iter_free(iter);
 
 out_2:
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -1460,13 +1460,13 @@ static int __eventsystem_request_earlier_data(const char *event_name,
        GError *error = NULL;
        GDBusProxy *proxy = NULL;
        GVariant *param = NULL;
+       GVariant *value = NULL;
        gint result = 0;
        bundle_raw *raw = NULL;
        int len = 0;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
                _E("getting gdbus-connetion error");
@@ -1475,7 +1475,7 @@ static int __eventsystem_request_earlier_data(const char *event_name,
        }
 
        proxy = g_dbus_proxy_new_sync(conn,
-               G_DBUS_PROXY_FLAGS_NONE, NULL,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
                ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
                NULL, &error);
 
@@ -1487,7 +1487,7 @@ static int __eventsystem_request_earlier_data(const char *event_name,
        }
 
        param = g_variant_new("(s)", event_name);
-       GVariant *value = g_dbus_proxy_call_sync(proxy, "GetEarlierData", param,
+       value = g_dbus_proxy_call_sync(proxy, "GetEarlierData", param,
                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
        if (error != NULL) {
                _E("proxy call sync error(%s)", error->message);
@@ -1496,46 +1496,358 @@ static int __eventsystem_request_earlier_data(const char *event_name,
                goto out_2;
        }
 
-       g_variant_get(value, "(iis)", &result, &len, &raw);
-       g_variant_unref(value);
+       g_variant_get(value, "(ii&s)", &result, &len, &raw);
 
        _D("result(%d), len(%d)", result, len);
 
        if (!result && raw && len > 0) {
                callback(event_name, raw, len, user_data);
-               bundle_free_encoded_rawdata(&raw);
+               ret = ES_R_OK;
+       } else {
+               ret = ES_R_ERROR;
        }
 
-       ret = ES_R_OK;
+out_2:
+       g_object_unref(proxy);
+       g_variant_unref(value);
+out_1:
+       if (conn)
+               g_object_unref(conn);
+
+       return ret;
+}
+#endif
+
+static int __request_esd_for_last_data(const char *event_name, bool check)
+{
+       int ret = 0;
+       GDBusConnection *conn = NULL;
+       GError *error = NULL;
+       GDBusProxy *proxy = NULL;
+       GVariant *param = NULL;
+       GVariant *value = NULL;
+       gint result = 0;
+
+       if (!_initialized)
+               __initialize();
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM,
+                               ES_TYPE_SYSTEM) < 0) {
+               _E("getting gdbus-connetion error");
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       proxy = g_dbus_proxy_new_sync(conn,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
+               ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
+               NULL, &error);
+
+       if (proxy == NULL) {
+               _E("failed to create new proxy, error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       param = g_variant_new("(ss)", event_name,
+                       check ? s_info.own_name_session_bus :
+                       s_info.own_name_system_bus);
+       value = g_dbus_proxy_call_sync(proxy,
+                       check ? "CheckLastData" : "KeepLastData", param,
+                       G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+
+       if (error != NULL) {
+               _E("proxy call sync error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_2;
+       }
+
+       g_variant_get(value, "(i)", &result);
+
+       _D("result(%d)", result);
+
+       ret = result;
+
+out_2:
+       g_object_unref(proxy);
+       g_variant_unref(value);
+out_1:
+       if (conn)
+               g_object_unref(conn);
+
+       return ret;
+}
+
+static int __eventsystem_launch_on_event_for_userevent(const char *event_name,
+               bundle *data, gboolean trusted)
+{
+       int ret = ES_R_EINVAL;
+       GDBusConnection *conn = NULL;
+       GError *error = NULL;
+       GDBusProxy *proxy = NULL;
+       GVariant *param = NULL;
+       GVariant *value = NULL;
+       gint result = 0;
+       bundle_raw *raw = NULL;
+       bundle *buf = data;
+       int len;
+
+       if (!_initialized)
+               __initialize();
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SYSTEM, ES_TYPE_SYSTEM) < 0) {
+               _E("getting gdbus-connetion error");
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       proxy = g_dbus_proxy_new_sync(conn,
+               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, NULL,
+               ESD_BUS_NAME, ESD_OBJECT_PATH, ESD_INTERFACE_NAME,
+               NULL, &error);
+       if (proxy == NULL) {
+               _E("failed to create new proxy, error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_1;
+       }
+
+       bundle_encode(buf, &raw, &len);
+
+       param = g_variant_new("(ssib)", event_name, raw, len, trusted);
+       value = g_dbus_proxy_call_sync(proxy, "LaunchOnEventFromUserEvent", param,
+               G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error);
+       if (error != NULL) {
+               _E("proxy call sync error(%s)", error->message);
+               g_error_free(error);
+               ret = ES_R_ERROR;
+               goto out_2;
+       }
+
+       _D("Launch on event from user event (%s)", event_name);
+
+       g_variant_get(value, "(i)", &result);
+
+       _D("result(%d)", result);
+
+       ret = result;
 
 out_2:
+       bundle_free_encoded_rawdata(&raw);
+       g_object_unref(proxy);
        g_variant_unref(value);
 out_1:
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
+
+       return ret;
+}
+
+
+static void _send_last_user_event(const char *event_name,
+               bundle *data, void *user_data)
+{
+       GDBusConnection *conn = NULL;
+       GError *error = NULL;
+       eventinfo_s *evti = NULL;
+       int ret;
+       struct last_data_item *item;
+       const char *is_trusted;
+
+       _D("send last data");
+
+       if (g_strcmp0(event_name, SYS_EVENT_REQUEST_LAST_DATA) != 0)
+               return;
+
+       evti = calloc(1, sizeof(eventinfo_s));
+       if (!evti) {
+               _E("memory alloc failed");
+               return;
        }
 
+       evti->event_name = (char *)bundle_get_val(data,
+                       EVT_KEY_KEPT_EVENT_NAME);
+       if (!evti->event_name) {
+               _E("memory alloc failed");
+               goto out_1;
+       }
+
+       item = (struct last_data_item *)g_hash_table_lookup(last_data_tbl,
+                       evti->event_name);
+       if (!item)
+               goto out_1;
+
+       evti->interface_name = __get_encoded_interface_name(evti->event_name);
+       if (!evti->interface_name) {
+               _E("interface_name is NULL");
+               goto out_1;
+       }
+
+       evti->member_name = strdup(EVENT_SYSTEM_MEMBER);
+       if (!evti->member_name) {
+               _E("memory alloc failed");
+               goto out_2;
+       }
+
+       evti->object_path = __get_object_path(evti->interface_name);
+       if (!evti->object_path) {
+               _E("object_path is NULL");
+               goto out_3;
+       }
+
+       evti->destination_name = (char *)bundle_get_val(data,
+                       EVT_KEY_KEPT_OWN_NAME);
+       if (!evti->destination_name) {
+               _E("object_path is NULL");
+               goto out_4;
+       }
+
+       is_trusted = bundle_get_val(data, EVT_KEY_KEPT_IS_TRUSTED);
+       if (!is_trusted) {
+               _E("object_path is NULL");
+               goto out_4;
+       }
+
+       if (strncmp("true", is_trusted, sizeof("true")) != 0) {
+                       if (!item->trusted_param)
+                               goto out_4;
+                       evti->is_trusted = true;
+       } else {
+                       if (!item->param)
+                               goto out_4;
+                       evti->is_trusted = false;
+       }
+
+       if (__get_gdbus_shared_connection(&conn, G_BUS_TYPE_SESSION,
+                               ES_TYPE_USER) == ES_R_OK) {
+               ret = g_dbus_connection_emit_signal(conn,
+                               evti->destination_name,
+                               evti->object_path,
+                               evti->interface_name,
+                               evti->member_name,
+                               evti->is_trusted ? item->trusted_param : item->param,
+                               &error);
+               if (ret == FALSE) {
+                       _E("Unable to connect to dbus: %s", error->message);
+                       g_error_free(error);
+               }
+       }
+
+       if (conn)
+               g_object_unref(conn);
+
+out_4:
+       FREE_AND_NULL(evti->object_path);
+out_3:
+       FREE_AND_NULL(evti->member_name);
+out_2:
+       FREE_AND_NULL(evti->interface_name);
+out_1:
+       FREE_AND_NULL(evti);
+}
+
+int eventsystem_keep_last_event_data(const char *event_name)
+{
+       int ret = 0;
+       unsigned int reg_id;
+       struct last_data_item *item;
+
+       if (last_data_tbl == NULL)
+               last_data_tbl = g_hash_table_new(g_str_hash, g_str_equal);
+
+       ret = __request_esd_for_last_data(event_name, false);
+       if (ret != ES_R_OK)
+               return ret;
+
+       item = calloc(1, sizeof(*item));
+       if (!item)
+               return ES_R_ENOMEM;
+
+       item->event_name = strdup(event_name);
+       item->param = NULL;
+       item->trusted_param = NULL;
+
+       g_hash_table_insert(last_data_tbl, item->event_name, item);
+
+       ret = eventsystem_register_event(SYS_EVENT_REQUEST_LAST_DATA,
+                       &reg_id, _send_last_user_event, NULL);
+
        return ret;
 }
-#endif
+
+static void __destroy_eventmap(gpointer data)
+{
+       eventmap_s *em = (eventmap_s *)data;
+
+       if (!em)
+               return;
+
+       if (em->interface_name)
+               free(em->interface_name);
+       if (em->member_name)
+               free(em->member_name);
+       if (em->event_name)
+               free(em->event_name);
+       free(em);
+}
+
+static eventmap_s *__create_eventmap(const char *interface_name,
+               const char *member_name, const char *event_name,
+               int event_type, eventsystem_cb callback, void *user_data)
+{
+       eventmap_s *em;
+
+       em = calloc(1, sizeof(eventmap_s));
+       if (!em) {
+               _E("Out of memory");
+               return NULL;
+       }
+
+       em->interface_name = strdup(interface_name);
+       if (!em->interface_name) {
+               _E("Failed to duplicate interface name");
+               __destroy_eventmap(em);
+               return NULL;
+       }
+
+       em->member_name = strdup(member_name);
+       if (!em->member_name) {
+               _E("Failed to duplicate member name");
+               __destroy_eventmap(em);
+               return NULL;
+       }
+
+       em->event_name = strdup(event_name);
+       if (!em->event_name) {
+               _E("Failed to duplicate event name");
+               __destroy_eventmap(em);
+               return NULL;
+       }
+
+       em->event_type = event_type;
+       em->es_cb = callback;
+       em->user_data = user_data;
+
+       return em;
+}
 
 int eventsystem_register_application_event(const char *event_name, unsigned int *reg_id,
                int *event_type, eventsystem_cb callback, void *user_data)
 {
        eventmap_s *em;
-       char *interface_name = NULL;
-       char *object_path = NULL;
-       char *member_name = NULL;
-       char *sender_name = NULL;
+       char *interface_name;
+       char *object_path;
+       char *member_name;
        GDBusSignalCallback filter;
        GBusType bus_type;
-       guint  subscription_id  = 0;
+       guint subscription_id = 0;
        int ret = 0;
        GDBusConnection *conn = NULL;
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        if (__check_eventname_validation_system((char *)event_name)) {
                if (__eventsystem_check_privilege_validation(event_name) != ES_R_OK) {
@@ -1600,96 +1912,84 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
        object_path = __get_object_path(interface_name);
        if (!object_path) {
                _E("failed get object_path");
-               FREE_AND_NULL(interface_name);
-               FREE_AND_NULL(member_name);
-               return ES_R_ERROR;
+               ret = ES_R_ERROR;
+               goto end;
        }
-       sender_name = NULL;
 
        _D("interface_name(%s), object_path(%s)", interface_name, object_path);
-       _D(" member_name(%s), sender_name(%s), type(%d), bus_type(%d)",
-               member_name, sender_name, *event_type, bus_type);
+       _D(" member_name(%s), type(%d), bus_type(%d)",
+               member_name, *event_type, bus_type);
 
        if (__get_gdbus_shared_connection(&conn, bus_type, *event_type) < 0) {
                _E("getting gdbus-connetion error");
-               FREE_AND_NULL(interface_name);
-               FREE_AND_NULL(object_path);
-               FREE_AND_NULL(member_name);
-               return ES_R_ERROR;
+               ret = ES_R_ERROR;
+               goto end;
        }
 
 #ifdef APPFW_EVENT_SYSTEM_EARLIER_FEATURE
        __eventsystem_request_earlier_data(event_name, callback, user_data);
 #endif
 
+       em = __create_eventmap(interface_name, member_name, event_name,
+                       *event_type, callback, user_data);
+       if (!em) {
+               ret = ES_R_ENOMEM;
+               goto end;
+       }
+
        subscription_id = g_dbus_connection_signal_subscribe(conn,
-               sender_name, /* sender */
+               NULL, /* sender */
                interface_name,
                member_name, /* member */
                object_path, /* object_path */
                NULL, /* arg0 */
                G_DBUS_SIGNAL_FLAGS_NONE,
                filter,
-               user_data,
+               em,
                NULL); /* user_data_free_func */
 
        _D("event_name(%s), subscription_id(%d)", event_name, subscription_id);
 
        if (subscription_id != 0) {
-               em = calloc(1, sizeof(eventmap_s));
-               if (!em) {
-                       _E("memory alloc failed");
-                       ret = ES_R_ENOMEM;
-               } else {
-                       em->interface_name = strdup(interface_name);
-                       em->member_name = strdup(member_name);
-                       em->event_name = strdup(event_name);
-                       em->es_cb = callback;
-                       em->bus_type = bus_type;
-                       em->reg_id = subscription_id;
-                       em->event_type = *event_type;
-
-                       if (!em->interface_name || !em->member_name ||
-                               !em->event_name) {
-                               _E("out_of_memory");
-                               FREE_AND_NULL(em->interface_name);
-                               FREE_AND_NULL(em->member_name);
-                               FREE_AND_NULL(em->event_name);
-                               FREE_AND_NULL(em);
-                               ret = ES_R_ENOMEM;
+               em->bus_type = bus_type;
+               em->reg_id = subscription_id;
+
+               system_event_list = g_list_append(system_event_list, em);
+               *reg_id = subscription_id;
+
+               ret = ES_R_OK;
+
+               if (em->bus_type == G_BUS_TYPE_SESSION &&
+                               em->event_type == ES_TYPE_USER) {
+                       if (s_info.own_name_session_bus == NULL) {
+                               _E("session bus is not ready");
+                               ret = ES_R_ERROR;
+                               g_dbus_connection_signal_unsubscribe(conn, subscription_id);
+                               __destroy_eventmap(em);
                        } else {
-                               system_event_list =
-                                       g_list_append(system_event_list, em);
-                               *reg_id = subscription_id;
-
-                               ret = ES_R_OK;
-
-                               if (em->bus_type == G_BUS_TYPE_SESSION &&
-                                        em->event_type == ES_TYPE_USER) {
-                                       if (s_info.own_name_session_bus == NULL) {
-                                               _E("session bus is not ready");
-                                               ret = ES_R_ERROR;
-                                       } else {
-                                               if (__eventsystem_setup_trusted_peer(event_name,
+                               if (__eventsystem_setup_trusted_peer(event_name,
                                                        s_info.own_name_session_bus) < 0) {
-                                                       _E("failed to setup trusted peer");
-                                                       ret = ES_R_ERROR;
-                                               }
-                                       }
+                                       _E("failed to setup trusted peer");
+                                       ret = ES_R_ERROR;
+                                       g_dbus_connection_signal_unsubscribe(conn, subscription_id);
+                                       __destroy_eventmap(em);
                                }
                        }
                }
        } else {
                _E("dbus subscribe: error(%d)", subscription_id);
+               __destroy_eventmap(em);
                ret = ES_R_ERROR;
        }
 
+       if (*event_type == ES_TYPE_USER)
+               __request_esd_for_last_data(event_name, true);
+end:
        FREE_AND_NULL(interface_name);
        FREE_AND_NULL(object_path);
        FREE_AND_NULL(member_name);
-       if (conn) {
+       if (conn)
                g_object_unref(conn);
-       }
 
        return ret;
 }
@@ -1697,100 +1997,116 @@ int eventsystem_register_application_event(const char *event_name, unsigned int
 int eventsystem_unregister_application_event(unsigned int reg_id)
 {
        eventmap_s em;
-       eventmap_s *em_data = NULL;
+       eventmap_s *em_data;
        GBusType bus_type;
-       GList *cb_list = NULL;
+       GList *cb_list;
        GDBusConnection *conn = NULL;
        eventsystem_event_type evt_type;
 
        retvm_if(reg_id == 0, ES_R_EINVAL, "Invalid argument : reg_id");
 
-       if (!_initialized) {
+       if (!_initialized)
                __initialize();
-       }
 
        em.reg_id = reg_id;
        cb_list = g_list_find_custom(system_event_list, &em,
-               (GCompareFunc)__event_compare_reg_id_cb);
-       if (cb_list) {
-               em_data = (eventmap_s *)cb_list->data;
+                       (GCompareFunc)__event_compare_reg_id_cb);
+       if (!cb_list) {
+               _E("not found matched item");
+               return ES_R_ERROR;
+       }
 
-               bus_type = em_data->bus_type;
-               evt_type = em_data->event_type;
+       em_data = (eventmap_s *)cb_list->data;
 
-               _D("unsubscribe: reg_id(%d), bus_type(%d)", reg_id, bus_type);
+       bus_type = em_data->bus_type;
+       evt_type = em_data->event_type;
 
-               if (__get_gdbus_shared_connection(&conn, bus_type, evt_type) < 0) {
-                       _E("getting gdbus-connetion error");
-                       return ES_R_ERROR;
-               }
-               g_dbus_connection_signal_unsubscribe(conn, reg_id);
-
-               system_event_list = g_list_remove(system_event_list, cb_list->data);
+       _D("unsubscribe: reg_id(%d), bus_type(%d)", reg_id, bus_type);
 
-               FREE_AND_NULL(em_data->interface_name);
-               FREE_AND_NULL(em_data->member_name);
-               FREE_AND_NULL(em_data->event_name);
-               FREE_AND_NULL(em_data);
-               g_object_unref(conn);
-       } else {
-               _E("not found matched item");
+       if (__get_gdbus_shared_connection(&conn, bus_type, evt_type) < 0) {
+               _E("getting gdbus-connetion error");
                return ES_R_ERROR;
        }
+       g_dbus_connection_signal_unsubscribe(conn, reg_id);
+
+       system_event_list = g_list_remove(system_event_list, cb_list->data);
+
+       __destroy_eventmap(em_data);
+       g_object_unref(conn);
 
        return ES_R_OK;
 }
 
 int eventsystem_application_finalize(void)
 {
-       gpointer key, value;
+       gpointer key;
+       gpointer value;
+       GHashTableIter iter;
+       char *key_item;
+       char *val_item;
+       struct last_data_item *last_item;
 
        _D("release all resouces");
 
-       if (system_event_list) {
+       if (system_event_list)
                g_list_free(system_event_list);
-       }
 
        if (check_tbl) {
-               GHashTableIter iter;
-
                g_hash_table_iter_init(&iter, check_tbl);
 
                while (g_hash_table_iter_next(&iter, &key, &value)) {
-                       char *val_item = (char *)value;
-                       if (val_item) {
+                       val_item = (char *)value;
+                       if (val_item)
                                free(val_item);
-                       } else {
+                       else
                                _E("check_tbl, val_item is NULL");
-                       }
                        g_hash_table_iter_remove(&iter);
                }
                g_hash_table_unref(check_tbl);
        }
 
        if (filter_tbl) {
-               GHashTableIter iter;
-
                g_hash_table_iter_init(&iter, filter_tbl);
 
                while (g_hash_table_iter_next(&iter, &key, &value)) {
-                       char *key_item = (char *)key;
-                       if (key_item) {
+                       key_item = (char *)key;
+                       if (key_item)
                                free(key_item);
-                       } else {
+                       else
                                _E("filter_tbl, key_item is NULL");
-                       }
-                       char *val_item = (char *)value;
-                       if (val_item) {
+
+                       val_item = (char *)value;
+                       if (val_item)
                                free(val_item);
-                       } else {
+                       else
                                _E("filter_tbl, val_item is NULL");
-                       }
+
                        g_hash_table_iter_remove(&iter);
                }
                g_hash_table_unref(filter_tbl);
        }
 
+       if (last_data_tbl) {
+               g_hash_table_iter_init(&iter, last_data_tbl);
+
+               while (g_hash_table_iter_next(&iter, &key, &value)) {
+                       last_item = (struct last_data_item *)value;
+                       if (last_item) {
+                               if (last_item->event_name)
+                                       free(last_item->event_name);
+                               if (last_item->param)
+                                       g_variant_unref(last_item->param);
+                               if (last_item->trusted_param)
+                                       g_variant_unref(last_item->trusted_param);
+                               free(last_item);
+                       } else {
+                               _E("last_data_tbl, val_item is NULL");
+                       }
+                       g_hash_table_iter_remove(&iter);
+               }
+               g_hash_table_unref(last_data_tbl);
+       }
+
        FREE_AND_NULL(s_info.own_name_system_bus);
        FREE_AND_NULL(s_info.own_name_session_bus);