1 files changed, 37 insertions, 41 deletions

diff --git a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
index af55040ad1..c1ee4142c5 100644
--- a/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
+++ b/src/components/application_manager/src/commands/hmi/sdl_activate_app_request.cc
@@ -39,11 +39,9 @@ namespace application_manager {
 namespace commands {
 
 SDLActivateAppRequest::SDLActivateAppRequest(const MessageSharedPtr& message)
-    : RequestFromHMI(message) {
-}
+    : RequestFromHMI(message) {}
 
-SDLActivateAppRequest::~SDLActivateAppRequest() {
-}
+SDLActivateAppRequest::~SDLActivateAppRequest() {}
 
 void SDLActivateAppRequest::Run() {
   LOG4CXX_AUTO_TRACE(logger_);
@@ -56,38 +54,39 @@ void SDLActivateAppRequest::Run() {
       ApplicationManagerImpl::instance()->application(application_id);
 
   if (!app) {
-    LOG4CXX_WARN(logger_, "Can't find application within regular apps: "
-                  << application_id);
+    LOG4CXX_WARN(
+        logger_,
+        "Can't find application within regular apps: " << application_id);
 
     app = ApplicationManagerImpl::instance()->waiting_app(application_id);
 
     if (!app) {
-      LOG4CXX_WARN(logger_, "Can't find application within waiting apps: "
-                    << application_id);
+      LOG4CXX_WARN(
+          logger_,
+          "Can't find application within waiting apps: " << application_id);
       return;
     }
   }
 
   if (!app->IsRegistered()) {
-    DevicesApps devices_apps =
-        FindAllAppOnParticularDevice(app->device());
+    DevicesApps devices_apps = FindAllAppOnParticularDevice(app->device());
     if (!devices_apps.first && devices_apps.second.empty()) {
-      LOG4CXX_ERROR(logger_, "Can't find regular foreground app with the same "
-                    "connection id:" << app->device());
-      SendResponse(correlation_id(),
-                   SDL_ActivateApp, NO_APPS_REGISTERED);
+      LOG4CXX_ERROR(logger_,
+                    "Can't find regular foreground app with the same "
+                    "connection id:"
+                        << app->device());
+      SendResponse(correlation_id(), SDL_ActivateApp, NO_APPS_REGISTERED);
       return;
     }
     if (devices_apps.first) {
-      MessageHelper::SendLaunchApp(devices_apps.first->app_id(),
-                                   app->SchemaUrl(),
-                                   app->PackageName());
+      MessageHelper::SendLaunchApp(
+          devices_apps.first->app_id(), app->SchemaUrl(), app->PackageName());
     } else {
-      std::vector<ApplicationSharedPtr>::const_iterator it = devices_apps.second.begin();
+      std::vector<ApplicationSharedPtr>::const_iterator it =
+          devices_apps.second.begin();
       for (; it != devices_apps.second.end(); ++it) {
-        MessageHelper::SendLaunchApp((*it)->app_id(),
-                                     app->SchemaUrl(),
-                                     app->PackageName());
+        MessageHelper::SendLaunchApp(
+            (*it)->app_id(), app->SchemaUrl(), app->PackageName());
       }
     }
     subscribe_on_event(BasicCommunication_OnAppRegistered);
@@ -102,8 +101,7 @@ void SDLActivateAppRequest::onTimeOut() {
   using namespace hmi_apis::Common_Result;
   using namespace application_manager;
   unsubscribe_from_event(BasicCommunication_OnAppRegistered);
-  SendResponse(correlation_id(),
-               SDL_ActivateApp, APPLICATION_NOT_REGISTERED);
+  SendResponse(correlation_id(), SDL_ActivateApp, APPLICATION_NOT_REGISTERED);
 }
 
 void SDLActivateAppRequest::on_event(const event_engine::Event& event) {
@@ -119,11 +117,11 @@ void SDLActivateAppRequest::on_event(const event_engine::Event& event) {
   const uint32_t hmi_application_id = hmi_app_id(event.smart_object());
 
   ApplicationSharedPtr app =
-      application_manager::ApplicationManagerImpl::instance()->
-      application_by_hmi_app(hmi_application_id);
+      application_manager::ApplicationManagerImpl::instance()
+          ->application_by_hmi_app(hmi_application_id);
   if (!app) {
-    LOG4CXX_ERROR(logger_, "Application not found by HMI app id: "
-                  << hmi_application_id);
+    LOG4CXX_ERROR(
+        logger_, "Application not found by HMI app id: " << hmi_application_id);
     return;
   }
   policy::PolicyHandler::instance()->OnActivateApp(app->app_id(),
@@ -132,8 +130,8 @@ void SDLActivateAppRequest::on_event(const event_engine::Event& event) {
 
 uint32_t SDLActivateAppRequest::app_id() const {
   if ((*message_).keyExists(strings::msg_params)) {
-    if ((*message_)[strings::msg_params].keyExists(strings::app_id)){
-        return (*message_)[strings::msg_params][strings::app_id].asUInt();
+    if ((*message_)[strings::msg_params].keyExists(strings::app_id)) {
+      return (*message_)[strings::msg_params][strings::app_id].asUInt();
     }
   }
   LOG4CXX_DEBUG(logger_, "app_id section is absent in the message.");
@@ -143,11 +141,11 @@ uint32_t SDLActivateAppRequest::app_id() const {
 uint32_t SDLActivateAppRequest::hmi_app_id(
     const smart_objects::SmartObject& so) const {
   if (so.keyExists(strings::params)) {
-    if (so[strings::msg_params].keyExists(strings::application)){
-      if (so[strings::msg_params][strings::application].
-          keyExists(strings::app_id)) {
-        return so[strings::msg_params][strings::application]
-            [strings::app_id].asUInt();
+    if (so[strings::msg_params].keyExists(strings::application)) {
+      if (so[strings::msg_params][strings::application].keyExists(
+              strings::app_id)) {
+        return so[strings::msg_params][strings::application][strings::app_id]
+            .asUInt();
       }
     }
   }
@@ -155,18 +153,17 @@ uint32_t SDLActivateAppRequest::hmi_app_id(
   return 0;
 }
 
-DevicesApps
-SDLActivateAppRequest::FindAllAppOnParticularDevice(
+DevicesApps SDLActivateAppRequest::FindAllAppOnParticularDevice(
     const connection_handler::DeviceHandle handle) {
   DevicesApps apps;
 
   ApplicationManagerImpl::ApplicationListAccessor accessor;
-  ApplicationManagerImpl::ApplictionSet app_list = accessor.GetData();
+  const ApplicationSet app_list = accessor.applications();
 
-  ApplicationManagerImpl::ApplictionSetIt it = app_list.begin();
-  ApplicationManagerImpl::ApplictionSetIt it_end = app_list.end();
+  ApplicationSetIt it = app_list.begin();
+  ApplicationSetIt it_end = app_list.end();
 
-  for (;it != it_end; ++it) {
+  for (; it != it_end; ++it) {
     if (handle == (*it)->device()) {
       if ((*it)->is_foreground()) {
         apps.first = *it;
@@ -179,4 +176,3 @@ SDLActivateAppRequest::FindAllAppOnParticularDevice(
 
 }  // namespace commands
 }  // namespace application_manager
-