Merge pull request #1655 from smartdevicelink/bugfix/videostreaming_incorret_restart

Fix video streaming incorrect restart

Author: Robert Henigan

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

@@ -117,6 +117,7 @@ public class VideoStreamManager extends BaseVideoStreamManager {
     private String vehicleMake = null;
     private boolean isEncrypted = false;
     private boolean withPendingRestart = false;
+    private boolean wasCapabilityListenerAdded = false;
     private AbstractPacketizer videoPacketizer;
 
     // INTERNAL INTERFACES
@@ -188,7 +189,10 @@ public void onNotified(RPCNotification notification) {
                     if (VideoStreamManager.this.parameters == null) {
                         getVideoStreamingParams();
                     }
-                    internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, systemCapabilityListener);
+                    if (!wasCapabilityListenerAdded) {
+                        wasCapabilityListenerAdded = true;
+                        internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.VIDEO_STREAMING, systemCapabilityListener);
+                    }
                 }
                 checkState();
                 if (hasStarted && (isHMIStateVideoStreamCapable(prevOnHMIStatus)) && (!isHMIStateVideoStreamCapable(currentOnHMIStatus))) {

android/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java

@@ -133,14 +133,16 @@ public void resizeView(final int newWidth, final int newHeight) {
             @Override
             public void run() {
                 try {
-                    Constructor<? extends ViewGroup.LayoutParams> ctor =
-                            mainView.getLayoutParams().getClass().getDeclaredConstructor(int.class, int.class);
-                    mainView.setLayoutParams(ctor.newInstance(newWidth, newHeight));
-                    mainView.requestLayout();
-                    invalidate();
-                    onViewResized(newWidth, newHeight);
+                    if (mainView != null) {
+                        Constructor<? extends ViewGroup.LayoutParams> ctor =
+                                mainView.getLayoutParams().getClass().getDeclaredConstructor(int.class, int.class);
+                        mainView.setLayoutParams(ctor.newInstance(newWidth, newHeight));
+                        mainView.requestLayout();
+                        invalidate();
+                        onViewResized(newWidth, newHeight);
+                    }
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    DebugTool.logError(TAG, "Exception thrown during view resize", e);
                 }
             }
         });