summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBilal Alsharifi <bilal.alsharifi@gmail.com>2018-10-01 10:44:35 -0400
committerBilal Alsharifi <bilal.alsharifi@gmail.com>2018-10-01 10:44:35 -0400
commit1a2513da40655447a099204fe8b50acdbdf5c33b (patch)
treee6725d892d598b7d5b881da0a91960afd2301689
parent65e6fdef8b5ccff780aa8cda84d354a1bab9791f (diff)
downloadsdl_android-1a2513da40655447a099204fe8b50acdbdf5c33b.tar.gz
VideoStreamingManager state fixesfeature/sim_transport_integration_with_managers_2
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java7
-rw-r--r--sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java2
2 files changed, 8 insertions, 1 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
index bbac4c331..33c2e0a2d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -184,7 +184,9 @@ public class SdlManager{
if(getAppTypes().contains(AppHMIType.NAVIGATION) || getAppTypes().contains(AppHMIType.PROJECTION)){
- this.videoStreamingManager = new VideoStreamingManager(_internalInterface);
+ if (videoStreamingManager == null) {
+ this.videoStreamingManager = new VideoStreamingManager(_internalInterface);
+ }
this.videoStreamingManager.start(subManagerListener);
}
@@ -641,6 +643,9 @@ public class SdlManager{
@Override
public void onTransportEvent(List<TransportRecord> connectedTransports, boolean audioStreamTransportAvail, boolean videoStreamTransportAvail) {
+ if (videoStreamingManager == null){
+ videoStreamingManager = new VideoStreamingManager(_internalInterface);
+ }
//Pass to submanagers that need it
if(videoStreamingManager != null){
videoStreamingManager.handleTransportUpdated(connectedTransports, audioStreamTransportAvail, videoStreamTransportAvail);
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
index 4ca01ac5b..f833264d2 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java
@@ -1036,6 +1036,8 @@ public class SdlProtocol {
hashID = BitConverter.intFromByteArray(packet.payload, 0);
}
}
+
+ notifyDevTransportListener();
}
iSdlProtocol.onProtocolSessionStarted(serviceType, (byte) packet.getSessionId(), (byte)protocolVersion.getMajor(), "", hashID, packet.isEncrypted());