diff options
author | Bretty White <geekman3454@protonmail.com> | 2018-03-06 11:10:45 -0500 |
---|---|---|
committer | Bretty White <geekman3454@protonmail.com> | 2018-03-06 11:10:45 -0500 |
commit | 90f6b6c2ca4026ce384fafd6865ef85dd0a77842 (patch) | |
tree | 7ff2fb8e6945b59af912c30a5664750274eb3819 | |
parent | 6468f9f17a77fadb63c6e146f030bc5dad7ac351 (diff) | |
download | sdl_android-90f6b6c2ca4026ce384fafd6865ef85dd0a77842.tar.gz |
spacing issues
-rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java index 966ed12e2..a2943e474 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java +++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java @@ -1483,28 +1483,28 @@ public class SdlRouterService extends Service{ } } - // check and prevent a UAI from being passed to an app that is using a recycled session id - if (cleanedSessionMap != null && cleanedSessionMap.size() > 0 ) { - if(packet.getFrameType() == FrameType.Single && packet.getServiceType() == SdlPacket.SERVICE_TYPE_RPC) { - BinaryFrameHeader binFrameHeader = BinaryFrameHeader.parseBinaryHeader(packet.getPayload()); - if (binFrameHeader != null && FunctionID.UNREGISTER_APP_INTERFACE.getId() == binFrameHeader.getFunctionID()) { - Log.d(TAG, "Received an unregister app interface. Checking session hash before sending"); - // make sure that we don't try to unregister a recently added app that might have a - // session ID of a removed app whose UAI was delayed - int hashOfRemoved = this.cleanedSessionMap.get(session, -1); - int currentHash = this.sessionHashIdMap.get(session, -1); - if (hashOfRemoved != -1) { - // Current session contains key that was held before - if (hashOfRemoved != currentHash) { - // App assigned same session id but is a different app. Keep this from being killed - Log.d(TAG, "same session id for different apps found, dropping packet"); - this.cleanedSessionMap.delete(session); - return false; - } + // check and prevent a UAI from being passed to an app that is using a recycled session id + if (cleanedSessionMap != null && cleanedSessionMap.size() > 0 ) { + if(packet.getFrameType() == FrameType.Single && packet.getServiceType() == SdlPacket.SERVICE_TYPE_RPC) { + BinaryFrameHeader binFrameHeader = BinaryFrameHeader.parseBinaryHeader(packet.getPayload()); + if (binFrameHeader != null && FunctionID.UNREGISTER_APP_INTERFACE.getId() == binFrameHeader.getFunctionID()) { + Log.d(TAG, "Received an unregister app interface. Checking session hash before sending"); + // make sure that we don't try to unregister a recently added app that might have a + // session ID of a removed app whose UAI was delayed + int hashOfRemoved = this.cleanedSessionMap.get(session, -1); + int currentHash = this.sessionHashIdMap.get(session, -1); + if (hashOfRemoved != -1) { + // Current session contains key that was held before + if (hashOfRemoved != currentHash) { + // App assigned same session id but is a different app. Keep this from being killed + Log.d(TAG, "same session id for different apps found, dropping packet"); + this.cleanedSessionMap.delete(session); + return false; } } } } + } int packetSize = (int) (packet.getDataSize() + SdlPacket.HEADER_SIZE); //Log.i(TAG, "Checking packet size: " + packetSize); |