summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Semenyuk <VSemenyuk@luxoft.com>2013-10-17 05:48:51 -0700
committerVladislav Semenyuk <VSemenyuk@luxoft.com>2013-10-17 05:48:51 -0700
commit270945b03ce3159535410a3f188cf5723ff9c5e5 (patch)
tree542534322911812fc539627c41248f0cc70791a8
parent4a3dfcbb855ef62970827223915d9bc763372e6b (diff)
downloadsmartdevicelink-270945b03ce3159535410a3f188cf5723ff9c5e5.tar.gz
APPLINK-3641 Core.OnHMIStatus: HMI levels are not changes after going to HMILevel LIMITEDSDL_RB_B2.0
-rw-r--r--src/components/application_manager/src/application_manager_impl.cc11
-rw-r--r--src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc6
2 files changed, 9 insertions, 8 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc
index d0e694008..cd91f8ad5 100644
--- a/src/components/application_manager/src/application_manager_impl.cc
+++ b/src/components/application_manager/src/application_manager_impl.cc
@@ -444,10 +444,13 @@ bool ApplicationManagerImpl::ActivateApplication(Application* application) {
LOG4CXX_WARN(logger_, "Application is already active.");
return false;
}
- if (application->has_been_activated()) {
- MessageHelper::SendAppDataToHMI(application);
- } else {
- MessageHelper::SendChangeRegistrationRequestToHMI(application);
+ if (mobile_api::HMILevel::eType::HMI_LIMITED !=
+ application->hmi_level()) {
+ if (application->has_been_activated()) {
+ MessageHelper::SendAppDataToHMI(application);
+ } else {
+ MessageHelper::SendChangeRegistrationRequestToHMI(application);
+ }
}
if (!application->MakeFullscreen()) {
return false;
diff --git a/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc b/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc
index 4e62ec08c..a911f9de0 100644
--- a/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc
+++ b/src/components/application_manager/src/commands/hmi/on_app_activated_notification.cc
@@ -56,10 +56,8 @@ void OnAppActivatedNotification::Run() {
(*message_)[strings::params][hmi_response::code] =
hmi_apis::Common_Result::INVALID_DATA;
} else {
- if (mobile_api::HMILevel::eType::HMI_LIMITED != application->hmi_level()) {
- ApplicationManagerImpl::instance()->ActivateApplication(application);
- }
- }
+ ApplicationManagerImpl::instance()->ActivateApplication(application);
+ }
}
} // namespace commands