From 41fd5973c89d3202709027b0b13f30f54d9ee096 Mon Sep 17 00:00:00 2001
From: Joey Grover <joeygrover@gmail.com>
Date: Thu, 26 Oct 2017 10:26:13 -0400
Subject: Set accepted video params for protocol versions less than 5

Fixes #643
Fixes #638
---
 .../src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java       | 6 +++---
 1 file 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 e132997e2..7ff202f62 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();
         }
 
-- 
cgit v1.2.1