diff options
| author | Elvis Kuliiev <ekuliiev@luxoft.com> | 2018-05-24 14:45:28 +0300 |
|---|---|---|
| committer | Elvis Kuliiev <ekuliiev@luxoft.com> | 2018-05-24 14:45:28 +0300 |
| commit | e76fd11ca12f6d36f408977ab3c506ba9568a7a8 (patch) | |
| tree | 5d2d6ba9b9f1b5493346c28499f6380edb05cd97 | |
| parent | cc926afbecc315752ec8c768ae357462a2eb4084 (diff) | |
| download | sdl_core-e76fd11ca12f6d36f408977ab3c506ba9568a7a8.tar.gz | |
Fix HMI conflict resolving for applied app in LIMITED state
| -rw-r--r-- | src/components/application_manager/src/state_controller_impl.cc | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/components/application_manager/src/state_controller_impl.cc b/src/components/application_manager/src/state_controller_impl.cc index 942f9f0e3f..1eb75c4451 100644 --- a/src/components/application_manager/src/state_controller_impl.cc +++ b/src/components/application_manager/src/state_controller_impl.cc @@ -361,21 +361,15 @@ void StateControllerImpl::HmiLevelConflictResolver::operator()( mobile_apis::HMILevel::eType result_hmi_level = state_to_resolve->hmi_level(); - if (mobile_apis::HMILevel::HMI_FULL == applied_hmi_level) { - using namespace helpers; - if (mobile_apis::VideoStreamingState::STREAMABLE == result_video_state || - Compare<mobile_apis::AudioStreamingState::eType, EQ, ONE>( - result_audio_state, - mobile_apis::AudioStreamingState::AUDIBLE, - mobile_apis::AudioStreamingState::ATTENUATED)) { - result_hmi_level = mobile_apis::HMILevel::HMI_LIMITED; - } else { - result_hmi_level = mobile_apis::HMILevel::HMI_BACKGROUND; - } - } else if (mobile_apis::HMILevel::HMI_LIMITED == applied_hmi_level) { - if (to_resolve_hmi_level == applied_hmi_level) { - result_hmi_level = mobile_apis::HMILevel::HMI_BACKGROUND; - } + using namespace helpers; + if (mobile_apis::VideoStreamingState::STREAMABLE == result_video_state || + Compare<mobile_apis::AudioStreamingState::eType, EQ, ONE>( + result_audio_state, + mobile_apis::AudioStreamingState::AUDIBLE, + mobile_apis::AudioStreamingState::ATTENUATED)) { + result_hmi_level = mobile_apis::HMILevel::HMI_LIMITED; + } else { + result_hmi_level = mobile_apis::HMILevel::HMI_BACKGROUND; } if (std::make_tuple(to_resolve_hmi_level, |