diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-09-28 17:27:03 -0400 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-09-28 17:27:03 -0400 |
| commit | e6df5d23feda15099eac061391b4e60ab810c57c (patch) | |
| tree | 501dde3dac8536581105e1e443c352d467e06094 | |
| parent | 8b15bb1a05d7d287f3e9c5575af3c15a20936c15 (diff) | |
| download | sdl_core-fix/remove_keep_context_available.tar.gz | |
Remove keepContextAvailable from APIfix/remove_keep_context_available
keepContext is a special case where there is no data attached to the parameter, therefore a capability for this parameter is not needed.
4 files changed, 2 insertions, 9 deletions
diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json index 93292d1023..3a52bfdd18 100755 --- a/src/appMain/hmi_capabilities.json +++ b/src/appMain/hmi_capabilities.json @@ -476,7 +476,6 @@ "sourceAvailable": true, "volumeAvailable": true, "equalizerAvailable": true, - "keepContextAvailable" : true, "equalizerMaxChannelId": 10 } ], 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 0473dd1791..e9eabe89de 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 @@ -128,7 +128,6 @@ const std::map<std::string, std::string> GetModuleDataToCapabilitiesMapping() { // audio mapping["source"] = "sourceAvailable"; - mapping["keepContext"] = "keepContextAvailable"; mapping["volume"] = "volumeAvailable"; mapping["equalizerSettings"] = "equalizerAvailable"; @@ -309,7 +308,8 @@ ModuleCapability GetControlDataCapabilities( for (auto it = control_data.map_begin(); it != control_data.map_end(); ++it) { const std::string& request_parameter = it->first; - if (message_params::kId == request_parameter) { + if (message_params::kId == request_parameter || + message_params::kKeepContext == request_parameter) { continue; } if (message_params::kLightState == request_parameter) { diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml index 0b6eed072d..13d61c517a 100644 --- a/src/components/interfaces/HMI_API.xml +++ b/src/components/interfaces/HMI_API.xml @@ -2167,9 +2167,6 @@ <param name="sourceAvailable" type="Boolean" mandatory="false"> <description>Availability of the control of audio source. </description> </param> - <param name="keepContextAvailable" type="Boolean" mandatory="false"> - <description>Availability of the keepContext paramter. </description> - </param> <param name="volumeAvailable" type="Boolean" mandatory="false"> <description>Availability of the control of audio volume.</description> </param> diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml index 670793f1c4..a12dd528a0 100644 --- a/src/components/interfaces/MOBILE_API.xml +++ b/src/components/interfaces/MOBILE_API.xml @@ -3344,9 +3344,6 @@ <param name="sourceAvailable" type="Boolean" mandatory="false"> <description>Availability of the control of audio source. </description> </param> - <param name="keepContextAvailable" type="Boolean" mandatory="false"> - <description>Availability of the keepContext paramter. </description> - </param> <param name="volumeAvailable" type="Boolean" mandatory="false"> <description>Availability of the control of audio volume.</description> </param> |