Merge pull request #646 from smartdevicelink/bugfix/issues638_643

Set accepted video params for protocol versions less than 5

1 files changed, 3 insertions, 3 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
index 2f7e99aaf..a27f4a1fb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -3953,9 +3953,6 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 		VideoStreamingParameters acceptedParams = tryStartVideoStream(isEncrypted, parameters);

         if (acceptedParams != null) {

             return sdlSession.startVideoStream();

-        } else if(getWiProVersion() < 5){

-			sdlSession.setAcceptedVideoParams(new VideoStreamingParameters());

-			return sdlSession.startVideoStream();

         } else {

             return null;

         }

@@ -4146,6 +4143,9 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
         scheduler.shutdown();

 

         if (navServiceStartResponse) {

+			if(getWiProVersion() < 5){ //Versions 1-4 do not support streaming parameter negotiations

+				sdlSession.setAcceptedVideoParams(parameters);

+			}

 			return sdlSession.getAcceptedVideoParams();

         }