Address commentsbugfix/2808_copy

1 files changed, 16 insertions, 16 deletions

diff --git a/src/components/application_manager/src/hmi_state.cc b/src/components/application_manager/src/hmi_state.cc
index 42e5d63fa9..3487116baf 100644
--- a/src/components/application_manager/src/hmi_state.cc
+++ b/src/components/application_manager/src/hmi_state.cc
@@ -242,6 +242,10 @@ PhoneCallHmiState::PhoneCallHmiState(std::shared_ptr<Application> app,
     : HmiState(app, app_mngr, STATE_ID_PHONE_CALL) {}
 
 mobile_apis::HMILevel::eType PhoneCallHmiState::hmi_level() const {
+  using namespace mobile_apis;
+  if (HMILevel::INVALID_ENUM == parent_hmi_level()) {
+    return parent_hmi_level();
+  }
   return std::max(parent_hmi_level(), max_hmi_level());
 }
 
@@ -249,10 +253,6 @@ mobile_apis::HMILevel::eType PhoneCallHmiState::max_hmi_level() const {
   using namespace helpers;
   using namespace mobile_apis;
 
-  if (parent() && HMILevel::INVALID_ENUM == parent()->hmi_level()) {
-    return parent()->hmi_level();
-  }
-
   if (WindowType::WIDGET == window_type()) {
     return std::max(HMILevel::HMI_FULL, parent_max_hmi_level());
   }
@@ -276,6 +276,10 @@ DeactivateHMI::DeactivateHMI(std::shared_ptr<Application> app,
     : HmiState(app, app_mngr, STATE_ID_DEACTIVATE_HMI) {}
 
 mobile_apis::HMILevel::eType DeactivateHMI::hmi_level() const {
+  using namespace mobile_apis;
+  if (HMILevel::INVALID_ENUM == parent_hmi_level()) {
+    return parent_hmi_level();
+  }
   return std::max(parent_hmi_level(), max_hmi_level());
 }
 
@@ -283,10 +287,6 @@ mobile_apis::HMILevel::eType DeactivateHMI::max_hmi_level() const {
   using namespace helpers;
   using namespace mobile_apis;
 
-  if (parent() && HMILevel::INVALID_ENUM == parent()->hmi_level()) {
-    return parent()->hmi_level();
-  }
-
   if (WindowType::WIDGET == window_type()) {
     return std::max(HMILevel::HMI_FULL, parent_max_hmi_level());
   }
@@ -304,6 +304,10 @@ AudioSource::AudioSource(std::shared_ptr<Application> app,
 mobile_apis::HMILevel::eType AudioSource::hmi_level() const {
   using namespace mobile_apis;
 
+  if (HMILevel::INVALID_ENUM == parent_hmi_level()) {
+    return parent_hmi_level();
+  }
+
   if (WindowType::WIDGET == window_type() || keep_context_) {
     return std::max(parent_hmi_level(), max_hmi_level());
   }
@@ -331,10 +335,6 @@ mobile_apis::VideoStreamingState::eType AudioSource::video_streaming_state()
 mobile_apis::HMILevel::eType AudioSource::max_hmi_level() const {
   using namespace mobile_apis;
 
-  if (parent() && HMILevel::INVALID_ENUM == parent()->hmi_level()) {
-    return parent()->hmi_level();
-  }
-
   if (WindowType::WIDGET == window_type()) {
     return std::max(HMILevel::HMI_FULL, parent_max_hmi_level());
   }
@@ -380,6 +380,10 @@ mobile_apis::HMILevel::eType EmbeddedNavi::hmi_level() const {
   using namespace mobile_apis;
   using namespace helpers;
 
+  if (HMILevel::INVALID_ENUM == parent_hmi_level()) {
+    return parent_hmi_level();
+  }
+
   if (WindowType::WIDGET == window_type()) {
     return std::max(parent_hmi_level(), max_hmi_level());
   }
@@ -408,10 +412,6 @@ mobile_apis::HMILevel::eType EmbeddedNavi::max_hmi_level() const {
   using namespace mobile_apis;
   using namespace helpers;
 
-  if (parent() && HMILevel::INVALID_ENUM == parent()->hmi_level()) {
-    return parent()->hmi_level();
-  }
-
   if (WindowType::WIDGET == window_type()) {
     return std::max(HMILevel::HMI_FULL, parent_max_hmi_level());
   }