X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy_manager%2Fpolicy_manager.cpp;fp=policy_manager%2Fpolicy_manager.cpp;h=c7bb0071cbcae675937293372f7cb4020d90027c;hb=e65b048f311335ee550ac51f97f8ce50468babf9;hp=a482e0cbb35ba95729a811f362d27ebe3f676fde;hpb=1859dd4135f5d019f16a1333df318ecd1211afb9;p=apps%2Fagl-service-windowmanager-2017.git

diff --git a/policy_manager/policy_manager.cpp b/policy_manager/policy_manager.cpp
index a482e0c..c7bb007 100644
--- a/policy_manager/policy_manager.cpp
+++ b/policy_manager/policy_manager.cpp
@@ -688,19 +688,16 @@ int PolicyManager::timerEvent(sd_event_source *source, uint64_t usec, void *data
 
 int PolicyManager::setStateTransitionProcessToSystemd(int event_id, uint64_t delay_ms, std::string role)
 {
+    struct sd_event_source *event_source;
     HMI_DEBUG("wm:pm", "event_id:0x%x delay:%d role:%s", event_id, delay_ms, role.c_str());
 
-    // Store requested role
-    this->req_role_list[event_id] = role;
-
     if (0 == delay_ms)
     {
-        int ret = sd_event_add_defer(afb_daemon_get_event_loop(), NULL,
+        int ret = sd_event_add_defer(afb_daemon_get_event_loop(), &event_source,
                                      &pm::transitionStateWrapper, new int(event_id));
         if (0 > ret)
         {
             HMI_ERROR("wm:pm", "Faild to sd_event_add_defer: errno:%d", ret);
-            this->req_role_list.erase(event_id);
             return -1;
         }
     }
@@ -708,27 +705,25 @@ int PolicyManager::setStateTransitionProcessToSystemd(int event_id, uint64_t del
     {
         // Get current time
         struct timespec time_spec;
-        clock_gettime(CLOCK_MONOTONIC, &time_spec);
+        clock_gettime(CLOCK_BOOTTIME, &time_spec);
 
         // Calculate timer fired time
         uint64_t usec = (time_spec.tv_sec * 1000000) + (time_spec.tv_nsec / 1000) + (delay_ms * 1000);
 
         // Set timer
-        struct sd_event_source *event_source;
         int ret = sd_event_add_time(afb_daemon_get_event_loop(), &event_source,
-                                    CLOCK_MONOTONIC, usec, 1,
+                                    CLOCK_BOOTTIME, usec, 1,
                                     &pm::timerEventWrapper, new int(event_id));
         if (0 > ret)
         {
             HMI_ERROR("wm:pm", "Faild to sd_event_add_time: errno:%d", ret);
-            this->req_role_list.erase(event_id);
             return -1;
         }
-
-        // Store event source
-        this->event_source_list[event_id] = event_source;
     }
-
+    // Store event source
+    this->event_source_list[event_id] = event_source;
+    // Store requested role
+    this->req_role_list[event_id] = role;
     return 0;
 }