diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2015-01-24 16:58:15 -0500 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2015-01-24 16:58:15 -0500 |
| commit | a24079cb8de5563376dcf782cdb9fe3cae063841 (patch) | |
| tree | 1fca30dde1aa30c7ac11fb6b009d2bd6420bd648 /src/components/application_manager/src/commands/hmi/activate_app_request.cc | |
| parent | f948dd4539eeecb2c32084cc39b68923fc94e3dd (diff) | |
| download | sdl_core-a24079cb8de5563376dcf782cdb9fe3cae063841.tar.gz | |
HmiStatus modify
HU DCHECK occurs during multisession registration
Remove unused variable
SIGSEGV handler added to flush logger queue
FixIncomplete device list in UpdateDeviceList request
Fix Memory leak on PutFile break
Fix Thread and Timer
Fix OnHmiStatus Notification
Fix Url array sending for endpoints.
Fix HashChange
Fix SDL parse incoming JSON message with both members error and result as success message
Fix Core crashes while connecting mobile app
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
Diffstat (limited to 'src/components/application_manager/src/commands/hmi/activate_app_request.cc')
| -rw-r--r-- | src/components/application_manager/src/commands/hmi/activate_app_request.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/components/application_manager/src/commands/hmi/activate_app_request.cc b/src/components/application_manager/src/commands/hmi/activate_app_request.cc index 29d998640e..5d4d8b352a 100644 --- a/src/components/application_manager/src/commands/hmi/activate_app_request.cc +++ b/src/components/application_manager/src/commands/hmi/activate_app_request.cc @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2013, Ford Motor Company * All rights reserved. * @@ -69,7 +69,7 @@ namespace application_manager { void ActivateAppRequest::on_event(const event_engine::Event& event) { - LOG4CXX_TRACE_ENTER(logger_); + LOG4CXX_AUTO_TRACE(logger_); const smart_objects::SmartObject* response = &(event.smart_object()); const hmi_apis::Common_Result::eType code = static_cast<hmi_apis::Common_Result::eType>( @@ -82,8 +82,15 @@ namespace application_manager { // Mobile id is converted to HMI id for HMI requests const uint32_t hmi_app_id = ApplicationManagerImpl::instance()-> application_id(correlation_id); - mobile_apis::HMILevel::eType requested_hmi_level = static_cast<mobile_apis::HMILevel::eType>( - (*message_)[strings::msg_params][strings::activate_app_hmi_level].asInt()); + + mobile_apis::HMILevel::eType requested_hmi_level = mobile_apis::HMILevel::HMI_FULL; + if ((*message_)[strings::msg_params].keyExists( + strings::activate_app_hmi_level)) { + requested_hmi_level = static_cast<mobile_apis::HMILevel::eType>( + (*message_)[strings::msg_params][strings::activate_app_hmi_level].asInt()); + LOG4CXX_INFO(logger_, "requested_hmi_level = " << requested_hmi_level); + } + if (0 == hmi_app_id) { LOG4CXX_ERROR(logger_, "Error hmi_app_id = "<< hmi_app_id); return; @@ -95,8 +102,10 @@ namespace application_manager { LOG4CXX_ERROR(logger_, "Application can't be activated."); return; } + if (mobile_apis::HMILevel::HMI_FULL == requested_hmi_level) { if (ApplicationManagerImpl::instance()->ActivateApplication(application)) { + LOG4CXX_DEBUG(logger_, "Put Application in FULL succes"); MessageHelper::SendHMIStatusNotification(*(application.get())); } } |