diff options
author | collin <collin+i@collinmcqueen.com> | 2021-06-02 09:38:41 -0400 |
---|---|---|
committer | collin <collin+i@collinmcqueen.com> | 2021-06-02 09:38:41 -0400 |
commit | 38f664c4bd7691f3208387d718ba78524eccb135 (patch) | |
tree | 5ed2dd80801a1f60f2763477ae8174d18316f8fc | |
parent | bef025d524ba9690e3d66521aabe48dcbde829cc (diff) | |
download | sdl_core-fix/phone_call_hmi_state.tar.gz |
address review commentsfix/phone_call_hmi_state
-rw-r--r-- | src/components/application_manager/include/application_manager/hmi_state.h | 1 | ||||
-rw-r--r-- | src/components/application_manager/src/hmi_state.cc | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/components/application_manager/include/application_manager/hmi_state.h b/src/components/application_manager/include/application_manager/hmi_state.h index e3a9784346..ab08a5ae0d 100644 --- a/src/components/application_manager/include/application_manager/hmi_state.h +++ b/src/components/application_manager/include/application_manager/hmi_state.h @@ -440,7 +440,6 @@ class PhoneCallHmiState : public HmiState { return mobile_apis::AudioStreamingState::NOT_AUDIBLE; } - mobile_apis::HMILevel::eType max_hmi_level() const OVERRIDE; mobile_apis::AudioStreamingState::eType max_audio_streaming_state() const OVERRIDE { return audio_streaming_state(); diff --git a/src/components/application_manager/src/hmi_state.cc b/src/components/application_manager/src/hmi_state.cc index af032fef38..628eb47f14 100644 --- a/src/components/application_manager/src/hmi_state.cc +++ b/src/components/application_manager/src/hmi_state.cc @@ -243,8 +243,7 @@ PhoneCallHmiState::PhoneCallHmiState(std::shared_ptr<Application> app, mobile_apis::HMILevel::eType PhoneCallHmiState::hmi_level() const { using namespace mobile_apis; - if (HMILevel::INVALID_ENUM == parent_hmi_level() || - HMILevel::HMI_NONE == parent_hmi_level()) { + if (HMILevel::INVALID_ENUM == parent_hmi_level()) { return parent_hmi_level(); } @@ -259,12 +258,7 @@ mobile_apis::HMILevel::eType PhoneCallHmiState::hmi_level() const { } } - return std::max(expected, parent_max_hmi_level()); -} - -mobile_apis::HMILevel::eType PhoneCallHmiState::max_hmi_level() const { - using namespace mobile_apis; - return std::max(HMILevel::HMI_FULL, parent_max_hmi_level()); + return std::max(expected, parent_hmi_level()); } SafetyModeHmiState::SafetyModeHmiState(std::shared_ptr<Application> app, |