diff options
| author | Joey Grover <joeygrover@gmail.com> | 2018-10-17 11:24:41 -0400 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2018-10-17 11:24:41 -0400 |
| commit | 7792ce2893a2c4133d29fbaaf8b6f161325480f6 (patch) | |
| tree | 643630cb1d4a490324a09e1f149842b132525f88 | |
| parent | 1767363782e56b4ca8c6096eb36a1743b8917631 (diff) | |
| download | sdl_android-7792ce2893a2c4133d29fbaaf8b6f161325480f6.tar.gz | |
Revert changes for NPE in SdlProtocol and fix method instead
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java | 6 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java index e3ef707f7..4ca01ac5b 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java +++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/SdlProtocol.java @@ -1139,18 +1139,18 @@ public class SdlProtocol { //In the future we will actually compare the record but at this point we can assume only //a single transport record per transport. //TransportType type = disconnectedTransport.getType(); - if(getTransportForSession(SessionType.NAV) != null && disconnectedTransport.equals(getTransportForSession(SessionType.NAV))){ + if(disconnectedTransport.equals(getTransportForSession(SessionType.NAV))){ //stopVideoStream(); iSdlProtocol.stopStream(SessionType.NAV); activeTransports.remove(SessionType.NAV); } - if(getTransportForSession(SessionType.PCM) != null && disconnectedTransport.equals(getTransportForSession(SessionType.PCM))){ + if(disconnectedTransport.equals(getTransportForSession(SessionType.PCM))){ //stopAudioStream(); iSdlProtocol.stopStream(SessionType.PCM); activeTransports.remove(SessionType.PCM); } - if(getTransportForSession(SessionType.RPC) != null && disconnectedTransport.equals(getTransportForSession(SessionType.RPC))){ + if(disconnectedTransport.equals(getTransportForSession(SessionType.RPC))){ //transportTypes.remove(type); boolean primaryTransportAvailable = false; if(requestedPrimaryTransports != null && requestedPrimaryTransports.size() > 1){ diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java b/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java index 8ff4f8c11..bcfc2e373 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java +++ b/sdl_android/src/main/java/com/smartdevicelink/transport/utl/TransportRecord.java @@ -57,8 +57,12 @@ public class TransportRecord implements Parcelable{ @Override public boolean equals(Object obj) { - if(obj !=null && obj instanceof TransportRecord){ - TransportRecord record = (TransportRecord)obj; + if(obj == null) { + return false; + } + + if (obj instanceof TransportRecord) { + TransportRecord record = (TransportRecord) obj; return record.type != null && record.type.equals(type) //Transport type is the same && ((record.address == null && address == null) //Both addresses are null || (record.address != null && record.address.equals(address))); //Or they match |