X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=policy_manager%2Fpolicy_manager.cpp;h=90256bb0eec2a2a404e05acddf42192860fb9ff9;hb=fcce7cc3687e54ecf251866357ebbd431a1b8d62;hp=999bc877ba749ce94fb23bdf41854a17f809c11f;hpb=5a2494b3b0f2b3f2bc885ab6d4b55f1d5d5822c9;p=apps%2Fagl-service-windowmanager.git

diff --git a/policy_manager/policy_manager.cpp b/policy_manager/policy_manager.cpp
index 999bc87..90256bb 100644
--- a/policy_manager/policy_manager.cpp
+++ b/policy_manager/policy_manager.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2018 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +27,7 @@
 
 extern "C"
 {
-#define AFB_BINDING_VERSION 2
+#define AFB_BINDING_VERSION 3
 #include <afb/afb-binding.h>
 #include <systemd/sd-event.h>
 #include "stm.h"
@@ -689,15 +690,15 @@ 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());
+    HMI_DEBUG("wm:pm event_id:0x%x delay:%d role:%s", event_id, delay_ms, role.c_str());
 
     if (0 == delay_ms)
     {
-        int ret = sd_event_add_defer(afb_daemon_get_event_loop(), &event_source,
+        int ret = sd_event_add_defer(afb_api_get_event_loop(afbBindingV3root), &event_source,
                                      &pm::transitionStateWrapper, new int(event_id));
         if (0 > ret)
         {
-            HMI_ERROR("wm:pm", "Faild to sd_event_add_defer: errno:%d", ret);
+            HMI_ERROR("wm:pm Failed to sd_event_add_defer: errno:%d", ret);
             return -1;
         }
     }
@@ -711,12 +712,12 @@ int PolicyManager::setStateTransitionProcessToSystemd(int event_id, uint64_t del
         uint64_t usec = (time_spec.tv_sec * 1000000) + (time_spec.tv_nsec / 1000) + (delay_ms * 1000);
 
         // Set timer
-        int ret = sd_event_add_time(afb_daemon_get_event_loop(), &event_source,
+        int ret = sd_event_add_time(afb_api_get_event_loop(afbBindingV3root), &event_source,
                                     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);
+            HMI_ERROR("wm:pm Failed to sd_event_add_time: errno:%d", ret);
             return -1;
         }
     }
@@ -729,20 +730,7 @@ int PolicyManager::setStateTransitionProcessToSystemd(int event_id, uint64_t del
 
 int PolicyManager::loadRoleDb()
 {
-    std::string file_name;
-
-    // Get afm application installed dir
-    char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");
-    HMI_DEBUG("afm_app_install_dir:%s", afm_app_install_dir);
-
-    if (!afm_app_install_dir)
-    {
-        HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
-    }
-    else
-    {
-        file_name = std::string(afm_app_install_dir) + std::string("/etc/roles.db");
-    }
+    std::string file_name(get_file_path("roles.db"));
 
     // Load roles.db
     json_object *json_obj;
@@ -832,19 +820,7 @@ int PolicyManager::loadStateDb()
 {
     HMI_DEBUG("Call");
 
-    // Get afm application installed dir
-    char const *afm_app_install_dir = getenv("AFM_APP_INSTALL_DIR");
-    HMI_DEBUG("afm_app_install_dir:%s", afm_app_install_dir);
-
-    std::string file_name;
-    if (!afm_app_install_dir)
-    {
-        HMI_ERROR("AFM_APP_INSTALL_DIR is not defined");
-    }
-    else
-    {
-        file_name = std::string(afm_app_install_dir) + std::string("/etc/states.db");
-    }
+    std::string file_name(get_file_path("states.db"));
 
     // Load states.db
     json_object *json_obj;