diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-07-28 16:50:18 -0400 |
|---|---|---|
| committer | Austin Kirk <askirk@umich.edu> | 2017-08-03 10:24:38 -0400 |
| commit | 67cf0a76ce4f582c9e6701a2d7391d6ff5bd2a5f (patch) | |
| tree | a9c83e739d38ab41a5c8e6308c481d5ff38346cd | |
| parent | eae3c9b9197a5f32387a3cd386b72665722453ec (diff) | |
| download | sdl_android-67cf0a76ce4f582c9e6701a2d7391d6ff5bd2a5f.tar.gz | |
Update versions in SdlPsm and make max pulic version public
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java | 3 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java index 00e86b058..541249c29 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java +++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java @@ -25,7 +25,8 @@ import java.util.List; public class WiProProtocol extends AbstractProtocol {
//byte _version = 1;
private final static String FailurePropagating_Msg = "Failure propagating ";
- private static final Version MAX_PROTOCOL_VERSION = new Version("5.0.0");
+ //If increasing MAX PROTOCOL VERSION major version, make sure to alter it in SdlPsm
+ public static final Version MAX_PROTOCOL_VERSION = new Version("5.0.0");
private Version protocolVersion = new Version("1.0.0");
byte _version = 1;
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java index ed86cbb69..1fc40bda4 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java +++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlPsm.java @@ -76,7 +76,7 @@ public class SdlPsm{ frameType = rawByte&(byte)FRAME_TYPE_MASK; //Log.trace(TAG, rawByte + " = Frame Type: " + frameType); - if((version < 1 || version > 4) //These are known versions supported by this library. + if((version < 1 || version > 5) //These are known versions supported by this library. && frameType!=SdlPacket.FRAME_TYPE_CONTROL){ return ERROR_STATE; } |