diff options
| author | Markos Rapitis <mrapitis@ford.com> | 2016-02-04 15:47:55 -0500 |
|---|---|---|
| committer | Markos Rapitis <mrapitis@ford.com> | 2016-02-04 15:47:55 -0500 |
| commit | 8490f90822931604c8b19d24abe2f58cfa83e2a3 (patch) | |
| tree | 8c01b363a72845bca3ddc3bcb797edda2aa646ef | |
| parent | ff204a1d36e122923917d4174a243f94133c09e1 (diff) | |
| download | sdl_android-feature/default_hb_value.tar.gz | |
Updated logic for heartbeat to default to 5 seconds for protocol version 3 and above.feature/default_hb_value
| -rw-r--r-- | sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java index 17c479050..5cb5978ed 100644 --- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java @@ -300,19 +300,21 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> setWiProVersion(version);
- if (sessionType.eq(SessionType.RPC)) {
-
- if ( (_transportConfig.getHeartBeatTimeout() != Integer.MAX_VALUE) && (version > 2))
- {
- HeartbeatMonitor outgoingHeartbeatMonitor = new HeartbeatMonitor();
- outgoingHeartbeatMonitor.setInterval(_transportConfig.getHeartBeatTimeout());
- sdlSession.setOutgoingHeartbeatMonitor(outgoingHeartbeatMonitor);
-
- HeartbeatMonitor incomingHeartbeatMonitor = new HeartbeatMonitor();
- incomingHeartbeatMonitor.setInterval(_transportConfig.getHeartBeatTimeout());
- sdlSession.setIncomingHeartbeatMonitor(incomingHeartbeatMonitor);
- }
-
+ if (sessionType.eq(SessionType.RPC)) {
+ if(version > 2) {
+ if((_transportConfig.getHeartBeatTimeout() == Integer.MAX_VALUE) && (version >= 3)) {
+ //for version 3 or above we need to set to 5 seconds by default
+ _transportConfig.setHeartBeatTimeout(5000);
+ }
+ if (_transportConfig.getHeartBeatTimeout() != Integer.MAX_VALUE){
+ HeartbeatMonitor outgoingHeartbeatMonitor = new HeartbeatMonitor();
+ outgoingHeartbeatMonitor.setInterval(_transportConfig.getHeartBeatTimeout());
+ sdlSession.setOutgoingHeartbeatMonitor(outgoingHeartbeatMonitor);
+ HeartbeatMonitor incomingHeartbeatMonitor = new HeartbeatMonitor();
+ incomingHeartbeatMonitor.setInterval(_transportConfig.getHeartBeatTimeout());
+ sdlSession.setIncomingHeartbeatMonitor(incomingHeartbeatMonitor);
+ }
+ }
startRPCProtocolSession(sessionID, correlationID);
} else if (sessionType.eq(SessionType.NAV)) {
NavServiceStarted();
|