Add null checks for vehicle type and make

Author: RHenigan

android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java

@@ -60,6 +60,7 @@
 import com.smartdevicelink.proxy.rpc.OnTouchEvent;
 import com.smartdevicelink.proxy.rpc.TouchCoord;
 import com.smartdevicelink.proxy.rpc.TouchEvent;
+import com.smartdevicelink.proxy.rpc.VehicleType;
 import com.smartdevicelink.proxy.rpc.VideoStreamingCapability;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;
@@ -95,7 +96,7 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 	private IVideoStreamListener streamListener;
 	private boolean isTransportAvailable = false;
 	private boolean hasStarted;
-	private String vehicleMake;
+	private String vehicleMake = null;
 
 	// INTERNAL INTERFACES
 
@@ -180,7 +181,9 @@ public void onNotified(RPCNotification notification) {
 	public VideoStreamManager(ISdl internalInterface){
 		super(internalInterface);
 
-		vehicleMake = internalInterface.getRegisterAppInterfaceResponse().getVehicleType().getMake();
+		if(internalInterface.getRegisterAppInterfaceResponse().getVehicleType() != null) {
+			vehicleMake = internalInterface.getRegisterAppInterfaceResponse().getVehicleType().getMake();
+		}
 		virtualDisplayEncoder = new VirtualDisplayEncoder();
 		hmiLevel = HMILevel.HMI_NONE;
 

base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java

@@ -142,8 +142,10 @@ public void update(VideoStreamingCapability capability, String vehicleMake){
         ImageResolution resolution = capability.getPreferredResolution();
         if(resolution!=null){
 
-            if((vehicleMake.contains("Ford") || vehicleMake.contains("Lincoln")) && ((resolution.getResolutionHeight()!=null && resolution.getResolutionHeight() > 800) || (resolution.getResolutionWidth() !=null && resolution.getResolutionWidth() > 800))) {
-                scale = 1.0 / 0.75;
+            if (vehicleMake != null) {
+                if ((vehicleMake.contains("Ford") || vehicleMake.contains("Lincoln")) && ((resolution.getResolutionHeight() != null && resolution.getResolutionHeight() > 800) || (resolution.getResolutionWidth() != null && resolution.getResolutionWidth() > 800))) {
+                    scale = 1.0 / 0.75;
+                }
             }
 
             if(resolution.getResolutionHeight()!=null && resolution.getResolutionHeight() > 0){ this.resolution.setResolutionHeight((int)(resolution.getResolutionHeight() / scale)); }