diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-10-23 16:33:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 16:33:33 -0400 |
| commit | bbdc7936c680408ab325a6241278a5f1ae3d35db (patch) | |
| tree | 9b736ec8adf93504cef55c9cc03655e039344484 | |
| parent | 5961c0ec0a0231ef485f07fbcfba4daca948cd79 (diff) | |
| parent | 03f2ea1fd20d72d11ff6b54b993636c04ee2d1a3 (diff) | |
| download | sdl_android-bbdc7936c680408ab325a6241278a5f1ae3d35db.tar.gz | |
Merge pull request #642 from smartdevicelink/bugfix/issue_641
bugfix / issue 641
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java index c3727d7ff..2f7e99aaf 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -6271,11 +6271,6 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
}
});
-
- VideoStreamingCapability capability = (VideoStreamingCapability)_systemCapabilityManager.getCapability(SystemCapabilityType.VIDEO_STREAMING);
- if(capability != null && capability.getIsHapticSpatialDataSupported()){
- hapticManager = new HapticInterfaceManager(iSdl);
- }
}
public void startVideoStreaming(Class<? extends SdlRemoteDisplay> remoteDisplayClass, VideoStreamingParameters parameters, boolean encrypted){
@@ -6284,6 +6279,10 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> Log.e(TAG, "Error starting video service");
return;
}
+ VideoStreamingCapability capability = (VideoStreamingCapability)_systemCapabilityManager.getCapability(SystemCapabilityType.VIDEO_STREAMING);
+ if(capability != null && capability.getIsHapticSpatialDataSupported()){
+ hapticManager = new HapticInterfaceManager(internalInterface);
+ }
this.remoteDisplayClass = remoteDisplayClass;
try {
encoder.init(context,streamListener,parameters);
|