From c7890a339a4b80e94e5d532a9e34400784638600 Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Fri, 22 Jun 2018 18:30:27 +0900 Subject: Bug Fix : Fix split bug Transition from split to split can't be achieved, because action is not set properly Change-Id: Ic9e701dd727b270ef7b6dd08e18face5a78b9f03 Signed-off-by: Kazumasa Mitsunari --- src/app.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index 6d04325..de7686f 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -473,13 +473,13 @@ WMError App::checkPolicy(unsigned req_num) std::string add_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaMain); // Change request area req_area = std::string(kNameLayoutSplit) + "." + std::string(kNameAreaSub); - HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split is happen", - trigger.area, req_area); + HMI_SEQ_NOTICE(req_num, "Change request area from %s to %s, because split happens", + trigger.area.c_str(), req_area.c_str()); // set another action std::string add_name = g_app_list.getAppID(curernt_sid, add_role, &found); if (!found) { - HMI_SEQ_ERROR(req_num, "Couldn't widhdraw with surfaceID : %s", curernt_sid); + HMI_SEQ_ERROR(req_num, "Couldn't widhdraw with surfaceID : %d", curernt_sid); ret = WMError::NOT_REGISTERED; return ret; } @@ -648,25 +648,25 @@ WMError App::setInvisibleTask(const std::string &role, bool split) { if (split) { - std::string main = - std::move(*this->id_alloc.lookup(state.main)); if (state.sub != *surface_id) { if (state.sub != -1) { //this->deactivate(state.sub); WMAction deact_sub; - deact_sub.role = main; + deact_sub.role = + std::move(*this->id_alloc.lookup(state.sub)); deact_sub.area = add_area; - deact_sub.appid = g_app_list.getAppID(state.sub, main, &found); + deact_sub.appid = g_app_list.getAppID(state.sub, deact_sub.role, &found); if (!found) { - HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist"); + HMI_SEQ_ERROR(req_num, "App doesn't exist for role : %s", + deact_sub.role.c_str()); return WMError::NOT_REGISTERED; } deact_sub.visible = task_visible; deact_sub.end_draw_finished = end_draw_finished; - HMI_SEQ_DEBUG(req_num, "sub surface doesn't exist"); + HMI_SEQ_DEBUG(req_num, "Set invisible task for %s", deact_sub.appid.c_str()); g_app_list.setAction(req_num, deact_sub); } } -- cgit 1.2.3-korg