diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-09-12 16:51:24 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2019-09-12 16:51:24 -0400 |
| commit | e993a85e0a0056dfbe62d5a55538b4b513777206 (patch) | |
| tree | b317dc6f0bedda713119831ab35da8de18d7851b | |
| parent | b7fb2674c58902876f1693344800047ca24e6f1c (diff) | |
| parent | c1ac132805464ac0b584f53fbada9c7086e5523a (diff) | |
| download | sdl_android-bugfix/resume_secondary_transport.tar.gz | |
Merge branch 'develop' into bugfix/resume_secondary_transportbugfix/resume_secondary_transport
| -rw-r--r-- | android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java | 11 |
1 files changed, 5 insertions, 6 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 13b41a806..73065b865 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 @@ -93,6 +93,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { private VideoStreamingParameters parameters; private IVideoStreamListener streamListener; private boolean isTransportAvailable = false; + private boolean hasStarted; // INTERNAL INTERFACES @@ -115,8 +116,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { } startEncoder(); stateMachine.transitionToState(StreamingStateMachine.STARTED); - - + hasStarted = true; } } @@ -316,6 +316,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { //Encoder should be up and running createRemoteDisplay(virtualDisplayEncoder.getVirtualDisplay()); stateMachine.transitionToState(StreamingStateMachine.STARTED); + hasStarted = true; } catch (Exception e) { stateMachine.transitionToState(StreamingStateMachine.ERROR); e.printStackTrace(); @@ -390,8 +391,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { * @return boolean (true = yes, false = no) */ public boolean isStreaming(){ - return (stateMachine.getState() == StreamingStateMachine.STARTED) || - (hmiLevel == HMILevel.HMI_FULL); + return (stateMachine.getState() == StreamingStateMachine.STARTED) && (hmiLevel == HMILevel.HMI_FULL); } /** @@ -399,8 +399,7 @@ public class VideoStreamManager extends BaseVideoStreamManager { * @return boolean (true = not paused, false = paused) */ public boolean isPaused(){ - return (stateMachine.getState() == StreamingStateMachine.STARTED) || - (hmiLevel != HMILevel.HMI_FULL); + return (hasStarted && stateMachine.getState() == StreamingStateMachine.STOPPED) || (hmiLevel != HMILevel.HMI_FULL); } /** |