summaryrefslogtreecommitdiffstats
path: root/policy_manager
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2019-01-29 13:18:17 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2019-02-04 19:54:01 +0900
commita0fa6394c0d8b7997343d6f2a44d9c2868f4be5f (patch)
tree33dee52eb43bfbf77fafbcecbe5e96a062179853 /policy_manager
parentb72e372690e677c38fa9b5ae90fb7fbe5a575c76 (diff)
Fix top surface becomes invisible when background surface is crashed.
Fix top surface becomes invisible when surface on same layer, such like application layer, is crashed. To fix this issue, I refactored attaching app to layer. Originally, window manager attached app to surface. This patch is the backport of master branch. Bug-AGL : SPEC-1635 Change-Id: Ie6713e669a25662e8547aa7782551ddae60c7e01 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat (limited to 'policy_manager')
-rw-r--r--policy_manager/db/roles.db2
-rw-r--r--policy_manager/db/roles.db.zipc2
-rw-r--r--policy_manager/db/roles.db.zipc.split2
-rw-r--r--policy_manager/policy_manager.cpp10
4 files changed, 8 insertions, 8 deletions
diff --git a/policy_manager/db/roles.db b/policy_manager/db/roles.db
index 5d31aea..184e602 100644
--- a/policy_manager/db/roles.db
+++ b/policy_manager/db/roles.db
@@ -8,7 +8,7 @@
},
{
"category": "debug",
- "role": "launcher | map | poi | browser | sdl | mixer | radio | hvac | debug | phone | video | music | settings | dashboard | fallback",
+ "role": "launcher | navigation | map | poi | browser | sdl | mixer | radio | hvac | debug | phone | video | music | settings | dashboard | fallback",
"area": "normal.full | split.main | split.sub | fullscreen",
"layer": "apps",
},
diff --git a/policy_manager/db/roles.db.zipc b/policy_manager/db/roles.db.zipc
index facb1d8..13ada24 100644
--- a/policy_manager/db/roles.db.zipc
+++ b/policy_manager/db/roles.db.zipc
@@ -8,7 +8,7 @@
},
{
"category": "map",
- "role": "map",
+ "role": "navigation",
"area": "normal.full | split.main",
"layer": "apps",
},
diff --git a/policy_manager/db/roles.db.zipc.split b/policy_manager/db/roles.db.zipc.split
index 73c80cf..cef2631 100644
--- a/policy_manager/db/roles.db.zipc.split
+++ b/policy_manager/db/roles.db.zipc.split
@@ -8,7 +8,7 @@
},
{
"category": "map",
- "role": "map",
+ "role": "navigation",
"area": "normal.full | split.main",
"layer": "apps",
},
diff --git a/policy_manager/policy_manager.cpp b/policy_manager/policy_manager.cpp
index 4955aa3..ab44b05 100644
--- a/policy_manager/policy_manager.cpp
+++ b/policy_manager/policy_manager.cpp
@@ -690,7 +690,7 @@ 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)
{
@@ -698,7 +698,7 @@ int PolicyManager::setStateTransitionProcessToSystemd(int event_id, uint64_t del
&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;
}
}
@@ -717,7 +717,7 @@ int PolicyManager::setStateTransitionProcessToSystemd(int event_id, uint64_t del
&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;
}
}
@@ -730,7 +730,7 @@ int PolicyManager::setStateTransitionProcessToSystemd(int event_id, uint64_t del
int PolicyManager::loadRoleDb()
{
- std::string file_name(get_file_path("roles.db", "wm:pm"));
+ std::string file_name(get_file_path("roles.db"));
// Load roles.db
json_object *json_obj;
@@ -820,7 +820,7 @@ int PolicyManager::loadStateDb()
{
HMI_DEBUG("Call");
- std::string file_name(get_file_path("states.db", "wm:pm"));
+ std::string file_name(get_file_path("states.db"));
// Load states.db
json_object *json_obj;