summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Kast <julian@livio.com>2020-09-08 10:21:22 -0400
committerJulian Kast <julian@livio.com>2020-09-08 10:21:22 -0400
commit93f97cea7d198a41b2d11cba8a35df90a5754c50 (patch)
tree97dd7977f470d8a562f86a0cdbba46595fd25c61
parent596eef84325ad9df121f6ef340cf6b38a1e98831 (diff)
downloadsdl_android-93f97cea7d198a41b2d11cba8a35df90a5754c50.tar.gz
Deprecate resetSession in SdlProtocolBase and remove resetSession in the TransportManager
-rw-r--r--android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java8
-rw-r--r--base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java7
-rw-r--r--base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java3
-rw-r--r--javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java6
4 files changed, 1 insertions, 23 deletions
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
index 50c3f9383..e4c9ab65a 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportManager.java
@@ -125,14 +125,6 @@ public class TransportManager extends TransportManagerBase{
}
}
- @Override
- @Deprecated
- public void resetSession(){
- if(transport != null){
- transport.resetSession();
- }
- }
-
/**
* Check to see if a transport is connected.
* @param transportType the transport to have its connection status returned. If `null` is
diff --git a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
index 59364f2cd..702bb5a2f 100644
--- a/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
+++ b/base/src/main/java/com/smartdevicelink/protocol/SdlProtocolBase.java
@@ -190,13 +190,8 @@ public class SdlProtocolBase {
return mtu;
}
+ @Deprecated
public void resetSession (){
- synchronized (TRANSPORT_MANAGER_LOCK) {
- if (transportManager == null) {
- throw new IllegalStateException("Attempting to reset session without setting a transport manager.");
- }
- transportManager.resetSession();
- }
}
public boolean isConnected(){
diff --git a/base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java b/base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java
index bcab4ff58..bc3e615a4 100644
--- a/base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java
+++ b/base/src/main/java/com/smartdevicelink/transport/TransportManagerBase.java
@@ -59,9 +59,6 @@ public abstract class TransportManagerBase {
public abstract void close(long sessionId);
- @Deprecated
- public abstract void resetSession();
-
/**
* Check to see if a transport is connected.
* @param transportType the transport to have its connection status returned. If `null` is
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java
index c8a07a1cc..1004de5ad 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/transport/TransportManager.java
@@ -85,12 +85,6 @@ public class TransportManager extends TransportManagerBase{
}
}
- @Deprecated
- @Override
- public void resetSession(){
-
- }
-
/**
* Check to see if a transport is connected.
* @param transportType the transport to have its connection status returned. If `null` is