diff options
| author | Frank Ronneburg <fronneburg@xevo.com> | 2018-07-04 01:33:03 +0900 |
|---|---|---|
| committer | fronneburg <fronneburg@xevo.com> | 2018-07-04 13:40:34 -0700 |
| commit | 558bbe28dac48af20aef7ae350d290aaf8dd0d1f (patch) | |
| tree | 5698c6705721df584960a9c0d3e69d4dc5cfe97c /src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h | |
| parent | be43a3b8f1fcbd256187fe1076d7980a8bfa4bbf (diff) | |
| download | sdl_core-558bbe28dac48af20aef7ae350d290aaf8dd0d1f.tar.gz | |
Merge pull request #296 in NAR/sdl-core from bugfux/handle_review_20180702 to feature/Ford-WiFi
* commit 'dcdc9f62eaa094292332b52846694bcf2a0e591d':
fix: remove "2" from audio/videoServiceTransports when secondary transport is disabled and servicesMap is empty
Diffstat (limited to 'src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h')
| -rw-r--r-- | src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h index a0fd436f98..fb685f33d3 100644 --- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h +++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h @@ -700,6 +700,7 @@ class ProtocolHandlerImpl std::vector<std::string>& secondaryTransports) const; void GenerateServiceTransportsForStartSessionAck( + bool secondary_enabled, const std::vector<std::string>& service_transports, const std::string& primary_connection_type, const impl::TransportType primary_transport_type, |