Update transitions in VideoStreamManagerfeature/issue_1248

1 files changed, 2 insertions, 3 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 e67abf47e..f09897e56 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
@@ -125,10 +125,11 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 		@Override
 		public void onServiceEnded(SdlSession session, SessionType type) {
 			if(SessionType.NAV.equals(type)){
-				stateMachine.transitionToState(StreamingStateMachine.NONE);
 				if(remoteDisplay!=null){
 					stopStreaming();
 				}
+				stateMachine.transitionToState(StreamingStateMachine.NONE);
+				transitionToState(SETTING_UP);
 			}
 		}
 
@@ -154,8 +155,6 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 					checkState();
 				}
 				if (hasStarted && (prevHMILevel == HMILevel.HMI_FULL || prevHMILevel == HMILevel.HMI_LIMITED) && (hmiLevel == HMILevel.HMI_NONE || hmiLevel == HMILevel.HMI_BACKGROUND)){
-					stateMachine.transitionToState(StreamingStateMachine.NONE);
-					transitionToState(SETTING_UP);
 					internalInterface.stopVideoService();
 				}
 			}