diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-10-23 10:52:03 -0400 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2017-10-23 10:52:03 -0400 |
| commit | d495b0c392813474fd12356b42e2234e03f7fde7 (patch) | |
| tree | 91ad20384d6ea71ab2d40e700c2559fa98d6c5e9 | |
| parent | 59fcaf3534028ff3814c6719f2efd81bd0e0ef8a (diff) | |
| download | sdl_android-d495b0c392813474fd12356b42e2234e03f7fde7.tar.gz | |
Fixes #637
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 35 |
1 files changed, 21 insertions, 14 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 e132997e2..c3727d7ff 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -6271,7 +6271,11 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
}
});
- hapticManager = new HapticInterfaceManager(iSdl);
+
+ 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){
@@ -6324,13 +6328,14 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> //Remote display has been created.
//Now is a good time to do parsing for spatial data
VideoStreamingManager.this.remoteDisplay = remoteDisplay;
- remoteDisplay.getMainView().post(new Runnable() {
- @Override
- public void run() {
- hapticManager.refreshHapticData(remoteDisplay.getMainView());
- }
- });
-
+ if(hapticManager != null) {
+ remoteDisplay.getMainView().post(new Runnable() {
+ @Override
+ public void run() {
+ hapticManager.refreshHapticData(remoteDisplay.getMainView());
+ }
+ });
+ }
//Get touch scalars
ImageResolution resolution = null;
if(getWiProVersion()>=5){ //At this point we should already have the capability
@@ -6355,12 +6360,14 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> public void onInvalidated(final SdlRemoteDisplay remoteDisplay) {
//Our view has been invalidated
//A good time to refresh spatial data
- remoteDisplay.getMainView().post(new Runnable() {
- @Override
- public void run() {
- hapticManager.refreshHapticData(remoteDisplay.getMainView());
- }
- });
+ if(hapticManager != null) {
+ remoteDisplay.getMainView().post(new Runnable() {
+ @Override
+ public void run() {
+ hapticManager.refreshHapticData(remoteDisplay.getMainView());
+ }
+ });
+ }
}
} ));
Thread showPresentation = new Thread(fTask);
|