diff options
author | Kozoriz <kozorizandriy@gmail.com> | 2016-03-02 12:42:33 +0200 |
---|---|---|
committer | Kozoriz <kozorizandriy@gmail.com> | 2016-03-07 09:20:53 +0200 |
commit | 50c815aec75fd91772559ebb5e261aaa9ad5789d (patch) | |
tree | cf2a5fbd073d6953c7d24daf839fdd03c6558482 /src/components/application_manager/include/application_manager/state_controller.h | |
parent | f42d358711ba06360131a5c3ac7621b5bec1fcda (diff) | |
download | sdl_core-50c815aec75fd91772559ebb5e261aaa9ad5789d.tar.gz |
Review correctives and buildability correctives.
Diffstat (limited to 'src/components/application_manager/include/application_manager/state_controller.h')
-rw-r--r-- | src/components/application_manager/include/application_manager/state_controller.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/components/application_manager/include/application_manager/state_controller.h b/src/components/application_manager/include/application_manager/state_controller.h index 411985598e..a6cd06247d 100644 --- a/src/components/application_manager/include/application_manager/state_controller.h +++ b/src/components/application_manager/include/application_manager/state_controller.h @@ -83,25 +83,24 @@ class StateController : public event_engine::EventObserver { app->SetPostponedState(state); return; } + hmi_apis::Common_HMILevel::eType hmi_level = + static_cast<hmi_apis::Common_HMILevel::eType>( + resolved_state->hmi_level()); - const bool is_full_allowed = - mobile_apis::HMILevel::HMI_FULL == resolved_state->hmi_level() - ? true - : false; + const bool is_full_allowed = hmi_apis::Common_HMILevel::FULL == hmi_level; if (SendActivateApp && is_full_allowed) { - hmi_apis::Common_HMILevel::eType hmi_level = - static_cast<hmi_apis::Common_HMILevel::eType>( - resolved_state->hmi_level()); - uint32_t corr_id = MessageHelper::SendActivateAppToHMI( - app->app_id(), hmi_level); - - subscribe_on_event(hmi_apis::FunctionID::BasicCommunication_ActivateApp, - corr_id); - waiting_for_activate[app->app_id()] = resolved_state; - } else { - ApplyRegularState(app, resolved_state); + int64_t corr_id = SendBCActivateApp(app, hmi_level, true); + if (-1 != corr_id) { + subscribe_on_event(hmi_apis::FunctionID::BasicCommunication_ActivateApp, + corr_id); + waiting_for_activate[app->app_id()] = resolved_state; + return; + } + LOG4CXX_ERROR(logger_, "Unable to send BC.ActivateApp"); + return; } + ApplyRegularState(app, resolved_state); } /** |