diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2018-01-26 13:48:19 -0500 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2018-01-26 13:48:19 -0500 |
| commit | bfb42a23d3c4b1bfdb177a985ac9a8b090800612 (patch) | |
| tree | ab37feae36a6e2b3559bf7d73069686384a211d2 | |
| parent | b973e81afb1d38a27a478ce706e16b5352fb026b (diff) | |
| parent | 61c37f3763b7f84dca8f42ffdaa705d454d1b711 (diff) | |
| download | sdl_core-bfb42a23d3c4b1bfdb177a985ac9a8b090800612.tar.gz | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | src/appMain/smartDeviceLink.ini | 4 | ||||
| -rw-r--r-- | src/components/remote_control/src/remote_control_plugin.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini index 6cc7c92bb1..7a7b901979 100644 --- a/src/appMain/smartDeviceLink.ini +++ b/src/appMain/smartDeviceLink.ini @@ -30,8 +30,6 @@ AudioStreamingPort = 5080 ; SDL source version ; represents as a git commit hash value SDLVersion = {GIT_COMMIT} -; SDL supported protocol version -MaxSupportedProtocolVersion = 5 ; All logging event could be dropped by setting $LogsEnabled to false LogsEnabled = true ; Contains .json/.ini files @@ -192,6 +190,8 @@ OpenAttemptTimeoutMs = 500 TCPAdapterPort = 12345 [ProtocolHandler] +; SDL supported protocol version +MaxSupportedProtocolVersion = 5 ; Packet with payload bigger than next value will be marked as a malformed ; for protocol v3 or higher ; For v2 protocol MaximumPayloadSize is 1488 diff --git a/src/components/remote_control/src/remote_control_plugin.cc b/src/components/remote_control/src/remote_control_plugin.cc index 921fc3794c..c885d724ad 100644 --- a/src/components/remote_control/src/remote_control_plugin.cc +++ b/src/components/remote_control/src/remote_control_plugin.cc @@ -284,7 +284,6 @@ bool RemoteControlPlugin::IsAppForPlugin( if (service()->IsRemoteControlApplication(app)) { RCAppExtensionPtr rc_app_extension = new RCAppExtension(GetModuleID()); app->AddExtension(rc_app_extension); - service()->NotifyHMIAboutHMILevel(app, app->hmi_level()); return true; } return false; |