Merge 85e7f29 into b51cda0

Author: bilal-alsharifi

android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java

@@ -76,12 +76,14 @@ public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, Lifecyc
     void initialize() {
         super.initialize();
 
-        if (_transportConfig != null && _transportConfig.getTransportType().equals(TransportType.MULTIPLEX)) {
-            this.session = new SdlSession(sdlSessionListener, (MultiplexTransportConfig) _transportConfig);
-        } else if (_transportConfig != null && _transportConfig.getTransportType().equals(TransportType.TCP)) {
-            this.session = new SdlSession(sdlSessionListener, (TCPTransportConfig) _transportConfig);
-        } else {
-            DebugTool.logError(TAG, "Unable to create session for transport type");
+        synchronized (SESSION_LOCK) {
+            if (_transportConfig != null && _transportConfig.getTransportType().equals(TransportType.MULTIPLEX)) {
+                this.session = new SdlSession(sdlSessionListener, (MultiplexTransportConfig) _transportConfig);
+            } else if (_transportConfig != null && _transportConfig.getTransportType().equals(TransportType.TCP)) {
+                this.session = new SdlSession(sdlSessionListener, (TCPTransportConfig) _transportConfig);
+            } else {
+                DebugTool.logError(TAG, "Unable to create session for transport type");
+            }
         }
     }
 
@@ -93,11 +95,13 @@ void cycle(SdlDisconnectedReason disconnectedReason) {
             //We don't want to alert higher if we are just cycling for legacy bluetooth
             onClose("Sdl Proxy Cycled", new SdlException("Sdl Proxy Cycled", SdlExceptionCause.SDL_PROXY_CYCLED), disconnectedReason);
         }
-        if (session != null) {
-            try {
-                session.startSession();
-            } catch (SdlException e) {
-                e.printStackTrace();
+        synchronized (SESSION_LOCK) {
+            if (session != null) {
+                try {
+                    session.startSession();
+                } catch (SdlException e) {
+                    e.printStackTrace();
+                }
             }
         }
     }
@@ -163,16 +167,18 @@ void onTransportDisconnected(String info, boolean availablePrimary, BaseTranspor
      */
     @Override
     void startVideoService(boolean isEncrypted, VideoStreamingParameters parameters, boolean afterPendingRestart) {
-        if (session == null) {
-            DebugTool.logWarning(TAG, "SdlSession is not created yet.");
-            return;
-        }
-        if (!session.getIsConnected()) {
-            DebugTool.logWarning(TAG, "Connection is not available.");
-            return;
-        }
+        synchronized (SESSION_LOCK) {
+            if (session == null) {
+                DebugTool.logWarning(TAG, "SdlSession is not created yet.");
+                return;
+            }
+            if (!session.getIsConnected()) {
+                DebugTool.logWarning(TAG, "Connection is not available.");
+                return;
+            }
 
-        session.setDesiredVideoParams(parameters);
+            session.setDesiredVideoParams(parameters);
+        }
         tryStartVideoStream(isEncrypted, parameters, afterPendingRestart);
     }
 
@@ -185,9 +191,11 @@ void startVideoService(boolean isEncrypted, VideoStreamingParameters parameters,
      * @param parameters  VideoStreamingParameters that are desired. Does not guarantee this is what will be accepted.
      */
     private void tryStartVideoStream(boolean isEncrypted, VideoStreamingParameters parameters, boolean afterPendingRestart) {
-        if (session == null) {
-            DebugTool.logWarning(TAG, "SdlSession is not created yet.");
-            return;
+        synchronized (SESSION_LOCK) {
+            if (session == null) {
+                DebugTool.logWarning(TAG, "SdlSession is not created yet.");
+                return;
+            }
         }
         if (getProtocolVersion() != null && getProtocolVersion().getMajor() >= 5 && !systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)) {
             DebugTool.logWarning(TAG, "Module doesn't support video streaming.");
@@ -198,17 +206,20 @@ private void tryStartVideoStream(boolean isEncrypted, VideoStreamingParameters p
             return;
         }
 
+        synchronized (SESSION_LOCK) {
+            if (afterPendingRestart || !videoServiceStartResponseReceived || !videoServiceStartResponse //If we haven't started the service before
+                    || (videoServiceStartResponse && isEncrypted && !session.isServiceProtected(SessionType.NAV))) { //Or the service has been started but we'd like to start an encrypted one
+                if (session != null) {
+                    session.setDesiredVideoParams(parameters);
+                }
+                videoServiceStartResponseReceived = false;
+                videoServiceStartResponse = false;
 
-        if (afterPendingRestart || !videoServiceStartResponseReceived || !videoServiceStartResponse //If we haven't started the service before
-                || (videoServiceStartResponse && isEncrypted && !session.isServiceProtected(SessionType.NAV))) { //Or the service has been started but we'd like to start an encrypted one
-            session.setDesiredVideoParams(parameters);
-
-            videoServiceStartResponseReceived = false;
-            videoServiceStartResponse = false;
-
-            addVideoServiceListener();
-            session.startService(SessionType.NAV, isEncrypted);
-
+                addVideoServiceListener();
+                if (session != null) {
+                    session.startService(SessionType.NAV, isEncrypted);
+                }
+            }
         }
     }
 
@@ -237,20 +248,27 @@ public void onServiceError(SdlSession session, SessionType type, String reason)
                     videoServiceStartResponse = false;
                 }
             };
-            session.addServiceListener(SessionType.NAV, videoServiceListener);
+
+            synchronized (SESSION_LOCK) {
+                if (session != null) {
+                    session.addServiceListener(SessionType.NAV, videoServiceListener);
+                }
+            }
         }
     }
 
     @Override
     void startAudioService(boolean isEncrypted) {
-        if (session == null) {
-            DebugTool.logWarning(TAG, "SdlSession is not created yet.");
-            return;
-        }
-        if (!session.getIsConnected()) {
-            DebugTool.logWarning(TAG, "Connection is not available.");
-            return;
+        synchronized (SESSION_LOCK) {
+            if (session == null) {
+                DebugTool.logWarning(TAG, "SdlSession is not created yet.");
+                return;
+            }
+            if (!session.getIsConnected()) {
+                DebugTool.logWarning(TAG, "Connection is not available.");
+                return;
+            }
+            session.startService(SessionType.PCM, isEncrypted);
         }
-        session.startService(SessionType.PCM, isEncrypted);
     }
 }