diff options
| author | JackLivio <jack@livio.io> | 2017-09-28 17:12:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 17:12:22 -0400 |
| commit | b7ee0366e1494a2dde2f111b240b69da895d61c3 (patch) | |
| tree | 966396bc7e4472b92dbf39ed024893ca77962b3f | |
| parent | c183b580e49234df3df3410c79df140e0897b503 (diff) | |
| download | sdl_core-revert-1789-fix/build_break_without_log.tar.gz | |
Revert "fix: build break with ENABLE_LOG=OFF"revert-1789-fix/build_break_without_log
3 files changed, 9 insertions, 10 deletions
diff --git a/src/components/application_manager/src/application_manager_impl.cc b/src/components/application_manager/src/application_manager_impl.cc index 1d41388910..411813cc83 100644 --- a/src/components/application_manager/src/application_manager_impl.cc +++ b/src/components/application_manager/src/application_manager_impl.cc @@ -1611,11 +1611,11 @@ void ApplicationManagerImpl::SendMessageToMobile( (*message)[strings::params][strings::function_id].asUInt()); if (function_id == mobile_apis::FunctionID::RegisterAppInterfaceID && (*message)[strings::msg_params][strings::success].asBool()) { + const bool is_for_plugin = plugin_manager_.IsAppForPlugins(app); LOG4CXX_INFO(logger_, - "Registered app " - << app->app_id() << " is " - << (plugin_manager_.IsAppForPlugins(app) ? "" : "not ") - << "for plugins."); + "Registered app " << app->app_id() << " is " + << (is_for_plugin ? "" : "not ") + << "for plugins."); } #endif // SDL_REMOTE_CONTROL } else if (app) { diff --git a/src/components/application_manager/src/policies/policy_handler.cc b/src/components/application_manager/src/policies/policy_handler.cc index e6ebaf3b83..ad21f533a1 100644 --- a/src/components/application_manager/src/policies/policy_handler.cc +++ b/src/components/application_manager/src/policies/policy_handler.cc @@ -808,17 +808,17 @@ bool PolicyHandler::IsAppSuitableForPolicyUpdate( const Applications::value_type value) const { LOG4CXX_AUTO_TRACE(logger_); + const uint32_t app_id = value->app_id(); + if (!value->IsRegistered()) { LOG4CXX_DEBUG(logger_, - "Application " << value->app_id() - << " is not marked as registered."); + "Application " << app_id << " is not marked as registered."); return false; } LOG4CXX_DEBUG(logger_, - "Application " << value->app_id() - << " marked as registered." - "Checking its parameters."); + "Application " << app_id << " marked as registered." + "Checking its parameters."); DeviceParams device_params = GetDeviceParams( value->device(), diff --git a/src/components/policy/policy_regular/src/cache_manager.cc b/src/components/policy/policy_regular/src/cache_manager.cc index 8b6b9a433e..b395e4e04c 100644 --- a/src/components/policy/policy_regular/src/cache_manager.cc +++ b/src/components/policy/policy_regular/src/cache_manager.cc @@ -36,7 +36,6 @@ #include <functional> #include <ctime> #include <cmath> -#include <sstream> #include "utils/file_system.h" #include "json/reader.h" |