summaryrefslogtreecommitdiffstats
path: root/policy_manager
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2018-12-18 12:43:42 -0500
committerScott Murray <scott.murray@konsulko.com>2019-01-17 21:24:17 +0000
commita33cbe3e083318a4f48d44a645ee24447536e3a6 (patch)
treeb3603fa28b97b9ccd9989365747a107268cdcaa1 /policy_manager
parent1d0966212b15c0481b506ba35374935601b0c861 (diff)
Reusing the windowmanager on the cluster demo platform requires modifications to the layers.json, areas.json, etc. configuration files. To allow this without breaking potential shared package feeds by building two versions, add a mechanism to allow over-riding the configuration files present in the widget with files in the directory /etc/xdg/windowmanager. Affected code has been refactored to use a new common configuration file path determination helper function to reduce duplication. Cherry-picked from flounder branch with rework to accommodate changes in master branch. Bug-AGL: SPEC-1805 Change-Id: Ib0014756fe684167950ddac534ea2363a1b6e7c3 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'policy_manager')
-rw-r--r--policy_manager/policy_manager.cpp30
1 files changed, 3 insertions, 27 deletions
diff --git a/policy_manager/policy_manager.cpp b/policy_manager/policy_manager.cpp
index 1c6995b..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.
@@ -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;