Skip to content

Commit ab0bb87

Browse files
author
Robert Henigan
authored
Merge pull request #1641 from smartdevicelink/bugfix/pass_encrypted_param
Fix issue in passing encrypted param to startRemoteDisplayStream()
2 parents 373b277 + 07b6ef5 commit ab0bb87

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ public void onError(String info) {
346346
* @param supportedPortraitStreamingRange constraints for vehicle display : min/max aspect ratio, min/max resolutions, max diagonal size.
347347
*/
348348
public void startRemoteDisplayStream(Context context, Class<? extends SdlRemoteDisplay> remoteDisplayClass, VideoStreamingParameters parameters, final boolean encrypted, VideoStreamingRange supportedLandscapeStreamingRange, VideoStreamingRange supportedPortraitStreamingRange) {
349-
configureGlobalParameters(context, remoteDisplayClass, isEncrypted, supportedPortraitStreamingRange, supportedLandscapeStreamingRange);
349+
configureGlobalParameters(context, remoteDisplayClass, encrypted, supportedPortraitStreamingRange, supportedLandscapeStreamingRange);
350350
if(majorProtocolVersion >= 5 && !internalInterface.getSystemCapabilityManager().isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)){
351351
stateMachine.transitionToState(StreamingStateMachine.ERROR);
352352
return;
@@ -365,7 +365,7 @@ public void startRemoteDisplayStream(Context context, Class<? extends SdlRemoteD
365365
*/
366366
@Deprecated
367367
public void startRemoteDisplayStream(Context context, Class<? extends SdlRemoteDisplay> remoteDisplayClass, VideoStreamingParameters parameters, final boolean encrypted){
368-
configureGlobalParameters(context, remoteDisplayClass, isEncrypted, null, null);
368+
configureGlobalParameters(context, remoteDisplayClass, encrypted, null, null);
369369
boolean isCapabilitySupported = internalInterface.getSystemCapabilityManager() != null && internalInterface.getSystemCapabilityManager().isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING);
370370
if (majorProtocolVersion >= 5 && !isCapabilitySupported) {
371371
DebugTool.logError(TAG, "Video streaming not supported on this module");
@@ -385,7 +385,7 @@ private void configureGlobalParameters(Context context, Class<? extends SdlRemot
385385
}
386386

387387

388-
private void processCapabilitiesWithPendingStart(boolean encrypted, VideoStreamingParameters parameters) {
388+
private void processCapabilitiesWithPendingStart(final boolean encrypted, VideoStreamingParameters parameters) {
389389
final VideoStreamingParameters params = (parameters == null) ? new VideoStreamingParameters() : new VideoStreamingParameters(parameters);
390390
if (majorProtocolVersion >= 5) {
391391
if (internalInterface.getSystemCapabilityManager() != null) {
@@ -411,7 +411,7 @@ public void onCapabilityRetrieved(Object capability) {
411411

412412
OnAppCapabilityUpdated onAppCapabilityUpdated = new OnAppCapabilityUpdated(appCapability);
413413
internalInterface.sendRPC(onAppCapabilityUpdated);
414-
startStreaming(params, isEncrypted);
414+
startStreaming(params, encrypted);
415415
}
416416

417417
@Override

0 commit comments

Comments
 (0)