diff options
| author | Collin <iCollin@users.noreply.github.com> | 2020-09-29 14:54:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 14:54:25 -0400 |
| commit | 438a5c9173835ec0541f35cf5967229be630dea3 (patch) | |
| tree | ebb0d21935f6b823b983aa867ddbe1434f97ca9a | |
| parent | 97e98cb6f617e75aab00281fca89bffa798f6da9 (diff) | |
| download | sdl_core-438a5c9173835ec0541f35cf5967229be630dea3.tar.gz | |
add webengine_websocket to TransportTypeProfileStringFromDeviceHandle (#3520)
* add webengine_websocket to TransportTypeProfileStringFromDeviceHandle
* differentiate transport name from cloud
* add WEBSOCKET and WEBENGINE devices to ini file
| -rw-r--r-- | src/appMain/smartDeviceLink.ini | 3 | ||||
| -rw-r--r-- | src/components/connection_handler/src/connection_handler_impl.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini index bd23e5b90c..0b27e6263a 100644 --- a/src/appMain/smartDeviceLink.ini +++ b/src/appMain/smartDeviceLink.ini @@ -316,7 +316,8 @@ OpenAttemptTimeoutMsResumptionDB = 500 ; Social, BackgroundProcess, Testing, System, Projection, RemoteControl, ; EmptyApp ; Possible transport types: TCP_WIFI, IAP_CARPLAY, IAP_USB_HOST_MODE, IAP_USB_DEVICE_MODE, -; IAP_USB, AOA_USB, IAP_BLUETOOTH, SPP_BLUETOOTH +; IAP_USB, AOA_USB, IAP_BLUETOOTH, SPP_BLUETOOTH, WEBSOCKET, +; WEBENGINE ; ; The default behavior is to always enable resumption. If an AppHMIType is not listed in this ; section, resumption is enabled for an app with the AppHMIType. diff --git a/src/components/connection_handler/src/connection_handler_impl.cc b/src/components/connection_handler/src/connection_handler_impl.cc index b9d1de8332..d4364af8df 100644 --- a/src/components/connection_handler/src/connection_handler_impl.cc +++ b/src/components/connection_handler/src/connection_handler_impl.cc @@ -944,6 +944,8 @@ ConnectionHandlerImpl::TransportTypeProfileStringFromDeviceHandle( return std::string("IAP_CARPLAY"); } else if (connection_type == "CLOUD_WEBSOCKET") { return std::string("WEBSOCKET"); + } else if (connection_type == "WEBENGINE_WEBSOCKET") { + return std::string("WEBENGINE"); #ifdef BUILD_TESTS } else if (connection_type == "BTMAC") { return std::string("BTMAC"); |