summaryrefslogtreecommitdiff
path: root/src/components/application_manager
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2018-08-16 10:34:35 -0400
committerjacobkeeler <jacob.keeler@livioradio.com>2018-08-16 11:10:54 -0400
commit5add6c28c2e171bc8d065164283b8b45e0486f90 (patch)
tree52c20cf678cc16f6a5942e2d590574e38e7c39d3 /src/components/application_manager
parent742dbbdb911d92ad8a9c9bcfca0d02800c9b0843 (diff)
downloadsdl_core-5add6c28c2e171bc8d065164283b8b45e0486f90.tar.gz
Fix issues after rebase
Diffstat (limited to 'src/components/application_manager')
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h2
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc2
-rw-r--r--src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc3
3 files changed, 5 insertions, 2 deletions
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
index 54ca43e6d7..22db12c68b 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
@@ -53,7 +53,7 @@ const char kSupportedLights[] = "supportedLights";
// LightControlCapabilities
const char kName[] = "name";
const char kDensityAvailable[] = "densityAvailable";
-const char krgbColorSpaceAvailable[] = "rgbColorSpaceAvailable";
+const char kRGBColorSpaceAvailable[] = "rgbColorSpaceAvailable";
} // strings
namespace result_codes {
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
index ce449896f4..0da1e4c6e7 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
@@ -171,7 +171,7 @@ bool CheckLightDataByCapabilities(
std::map<std::string, std::string> lightCapsMapping = {
{message_params::kId, strings::kName},
{message_params::kDensity, strings::kDensityAvailable},
- {message_params::kColor, strings::krgbColorSpaceAvailable}};
+ {message_params::kColor, strings::kRGBColorSpaceAvailable}};
auto it = light_data.map_begin();
for (; it != light_data.map_end(); ++it) {
if (message_params::kStatus == it->first ||
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
index 011950b35a..59d1919bb5 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
@@ -367,6 +367,9 @@ ResourceAllocationManagerImpl::all_supported_modules() {
result.push_back(enums_value::kClimate);
result.push_back(enums_value::kRadio);
result.push_back(enums_value::kSeat);
+ result.push_back(enums_value::kAudio);
+ result.push_back(enums_value::kLight);
+ result.push_back(enums_value::kHmiSettings);
return result;
}