aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-06-10 23:48:46 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-06-12 10:30:40 +0900
commitbdf5562f360402f810278ccbb3fdbab6b464d1c3 (patch)
treeb1cc67a646188c80212dc82a3bd9002a171711f5 /src
parent1476fb12566dd8d7de9c598bb0ac78e454f52d11 (diff)
Change function according to 1476fb
Change-Id: I372040dded0fd38139b3d8b2ebd0d8988d12e8f1 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Diffstat (limited to 'src')
-rw-r--r--src/app.cpp27
1 files changed, 24 insertions, 3 deletions
diff --git a/src/app.cpp b/src/app.cpp
index db00dea..d11ec8a 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -572,8 +572,15 @@ WMError App::do_transition(unsigned req_num)
* Check Policy
*/
// get current trigger
- auto trigger = g_app_list.getRequest(req_num);
+ bool found;
bool is_activate = true;
+ auto trigger = g_app_list.getRequest(req_num, &found);
+ if(!found)
+ {
+ WMError err = WMError::NO_ENTRY;
+ HMI_SEQ_ERROR(req_num, errorDescription(err));
+ return err;
+ }
/* get new status from Policy Manager
@@ -606,8 +613,14 @@ WMError App::do_transition(unsigned req_num)
// layer manager task
bool sync_draw_happen = false;
- for (const auto &y : g_app_list.getActions(req_num))
+ for (const auto &y : g_app_list.getActions(req_num, &found))
{
+ if (!found)
+ {
+ WMError err = WMError::NO_ENTRY;
+ HMI_SEQ_ERROR(req_num, "%s : Action is not set", errorDescription(err));
+ return err;
+ }
/*
do_task(y);
*/
@@ -1006,7 +1019,15 @@ void App::lm_enddraw(const char *drawing_name)
void App::do_enddraw(unsigned req_num)
{
// get actions
- auto actions = g_app_list.getActions(req_num);
+ bool found;
+ auto actions = g_app_list.getActions(req_num, &found);
+ if (!found)
+ {
+ WMError err = WMError::NO_ENTRY;
+ HMI_SEQ_ERROR(req_num, errorDescription(err));
+ return;
+ }
+
HMI_SEQ_INFO(req_num, "do endDraw");
for (const auto &act : actions)