diff options
| author | Joey Grover <joeygrover@gmail.com> | 2018-11-16 18:00:44 -0500 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2018-11-16 18:00:44 -0500 |
| commit | d1c588d27a8abcee222f8104a88ec3d7cc9acdd7 (patch) | |
| tree | 3142003a26665a22ce27ec390f62b3ac5672c1e3 | |
| parent | a36757ee71b1faa5935b78ce0d2237dae761a0c3 (diff) | |
| download | sdl_android-d1c588d27a8abcee222f8104a88ec3d7cc9acdd7.tar.gz | |
Handle extra data from parcel
*Needs additional verification* The Android binder attatches 24 extra bytes onto the parcel when attempting to read it in.
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java index 627463603..eff296c20 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java +++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlPacket.java @@ -5,7 +5,6 @@ import java.util.HashMap; import com.livio.BSON.BsonEncoder; import com.smartdevicelink.protocol.enums.FrameType; -import com.smartdevicelink.transport.enums.TransportType; import com.smartdevicelink.transport.utl.TransportRecord; import android.os.Parcel; @@ -13,6 +12,7 @@ import android.os.Parcelable; public class SdlPacket implements Parcelable{ + private static final int EXTRA_PARCEL_DATA_LENGTH = 24; public static final int HEADER_SIZE = 12; public static final int HEADER_SIZE_V1 = 8;//Backwards @@ -62,7 +62,7 @@ public class SdlPacket implements Parcelable{ //Most others public static final int FRAME_INFO_RESERVED = 0x00; - + int version; boolean encryption; int frameType; @@ -340,7 +340,7 @@ public class SdlPacket implements Parcelable{ this.priorityCoefficient = p.readInt(); - if(p.dataAvail() > 0) { + if(p.dataAvail() > EXTRA_PARCEL_DATA_LENGTH) { messagingVersion = p.readInt(); if(messagingVersion >= 2) { if (p.readInt() == 1) { //We should have a transport type attached |