diff options
| author | RHenigan <heniganr1@gmail.com> | 2020-03-23 16:21:16 -0400 |
|---|---|---|
| committer | RHenigan <heniganr1@gmail.com> | 2020-03-23 16:21:16 -0400 |
| commit | 9c5c4c18d32fef734880b4280f905903aacfa6cd (patch) | |
| tree | 84f77476af8d8c4213fcf1dcd586f367d3e1933c | |
| parent | 0b14a393969a4d12ea637f1d108c6d84f815041a (diff) | |
| download | sdl_android-bugfix/issue_1282.tar.gz | |
Add null checks for vehicle type and makebugfix/issue_1282
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java | 7 | ||||
| -rw-r--r-- | base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java index 5b4e764b9..86cbb8f6c 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java @@ -60,6 +60,7 @@ import com.smartdevicelink.proxy.rpc.OnHMIStatus; 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 class VideoStreamManager extends BaseVideoStreamManager { 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; diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java index 9edafe658..e689fb817 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java +++ b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java @@ -142,8 +142,10 @@ public class VideoStreamingParameters { 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)); } |