add createSession method to LCM

3 files changed, 14 insertions, 4 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index be95cf928..eb6ab2fd9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -73,8 +73,11 @@ public class LifecycleManager extends BaseLifecycleManager {
     private Context context;
 
     public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener) {
-        super(appConfig, listener);
+        super(appConfig, config, listener);
+    }
 
+    @Override
+    void createSession(BaseTransportConfig config) {
         if (config != null && config.getTransportType().equals(TransportType.MULTIPLEX)) {
             this.session = new SdlSession2(sdlConnectionListener, (MultiplexTransportConfig) config);
         } else if (config != null && config.getTransportType().equals(TransportType.TCP)) {
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index f2fc4aebf..4be04d403 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -134,7 +134,7 @@ abstract class BaseLifecycleManager {
     Version minimumProtocolVersion;
     Version minimumRPCVersion;
 
-    BaseLifecycleManager(AppConfig appConfig, LifecycleListener listener){
+    BaseLifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener){
         this.lifecycleListener = listener;
 
         this.rpcListeners = new HashMap<>();
@@ -147,6 +147,8 @@ abstract class BaseLifecycleManager {
         this.minimumRPCVersion = appConfig.getMinimumRPCVersion();
 
         this.systemCapabilityManager = new SystemCapabilityManager(internalInterface);
+
+        createSession(config);
     }
 
     public void start(){
@@ -1452,6 +1454,8 @@ abstract class BaseLifecycleManager {
      ********************************** Platform specific methods - START *************************************
      *********************************************************************************************************/
 
+    abstract void createSession(BaseTransportConfig config);
+
     void onProtocolSessionStarted (SessionType sessionType) {
         if (sessionType != null) {
             if (minimumProtocolVersion != null && minimumProtocolVersion.isNewerThan(getProtocolVersion()) == 1) {
@@ -1508,7 +1512,7 @@ abstract class BaseLifecycleManager {
 
     boolean endAudioStream() { return false; }
 
-    void setSdlSecurityStaticVars() {};
+    void setSdlSecurityStaticVars() {}
 
     /* *******************************************************************************************************
      ********************************** Platform specific methods - End *************************************
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
index 0cd661268..47ed40727 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java
@@ -44,7 +44,10 @@ import com.smartdevicelink.transport.BaseTransportConfig;
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class LifecycleManager extends BaseLifecycleManager {
     public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener) {
-        super(appConfig, listener);
+        super(appConfig, config, listener);
+    }
+
+    void createSession(BaseTransportConfig config) {
         this.session = new SdlSession(sdlConnectionListener, config);
     }
 }