summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaroslav Mamykin (GitHub) <ymamykin@luxoft.com>2019-11-05 18:36:46 +0200
committerYaroslav Mamykin (GitHub) <ymamykin@luxoft.com>2019-11-05 18:36:46 +0200
commit363a3a7536f6b49f20d476391f6eb1fa1ef7f28f (patch)
treea4179c22ede14446c182ddeaa55b27a37b9d4373
parent4d283e625dfa09d166d572fa7bf6e98e91f05050 (diff)
downloadsdl_core-fix/switch_to_incorrect_hmi_lvl_after_ign_off_on.tar.gz
Fix impossible activation of second app in case of resumptionfix/switch_to_incorrect_hmi_lvl_after_ign_off_on
Fixed applying of FULL hmi level for second application if first application has same type and is in LIMITED hmi level.
-rw-r--r--src/components/application_manager/src/state_controller_impl.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/components/application_manager/src/state_controller_impl.cc b/src/components/application_manager/src/state_controller_impl.cc
index 8368597370..3498e85cdd 100644
--- a/src/components/application_manager/src/state_controller_impl.cc
+++ b/src/components/application_manager/src/state_controller_impl.cc
@@ -516,7 +516,11 @@ mobile_apis::HMILevel::eType StateControllerImpl::GetAvailableHmiLevel(
(active_app.use_count() != 0) && active_app->app_id() != app->app_id();
if (is_audio_app) {
if (does_audio_app_with_same_type_exist) {
- result = app_mngr_.GetDefaultHmiLevel(app);
+ if (hmi_level != mobile_apis::HMILevel::HMI_FULL || app->is_navi()) {
+ result = app_mngr_.GetDefaultHmiLevel(app);
+ } else {
+ result = hmi_level;
+ }
} else if (is_active_app_exist) {
result = mobile_apis::HMILevel::HMI_LIMITED;
} else if (app->is_navi() &&