diff options
author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-06-03 10:42:36 -0400 |
---|---|---|
committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-06-03 10:42:36 -0400 |
commit | f2ee959c1d252d7ecc8537fcb108e8c57f162a8e (patch) | |
tree | d6715cc482863d9998475b4c49a0898082fb4d5a | |
parent | 30cb9d76521d24b447de5ca389018852cb4ad0a0 (diff) | |
download | sdl_android-f2ee959c1d252d7ecc8537fcb108e8c57f162a8e.tar.gz |
Cleanup LCM
3 files changed, 8 insertions, 10 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 dca8d0253..66fc880f4 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 @@ -48,15 +48,15 @@ import com.smartdevicelink.transport.enums.TransportType; */ @RestrictTo(RestrictTo.Scope.LIBRARY) public class LifecycleManager extends BaseLifecycleManager { - public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener){ - super(appConfig, config, listener); + public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener) { + super(appConfig, listener); if (config != null && config.getTransportType().equals(TransportType.MULTIPLEX)) { this.session = new SdlSession2(sdlConnectionListener, (MultiplexTransportConfig) config); - }else if(config != null &&config.getTransportType().equals(TransportType.TCP)){ + } else if (config != null && config.getTransportType().equals(TransportType.TCP)) { this.session = new SdlSession2(sdlConnectionListener, (TCPTransportConfig) config); - }else { - this.session = SdlSession.createSession((byte)getProtocolVersion().getMajor(),sdlConnectionListener, config); + } else { + this.session = SdlSession.createSession((byte) getProtocolVersion().getMajor(), sdlConnectionListener, config); } } } 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 0e62032b5..abafc5313 100644 --- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java +++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java @@ -150,11 +150,9 @@ abstract class BaseLifecycleManager { private boolean navServiceEndResponse = false; private boolean pcmServiceEndResponseReceived = false; private boolean pcmServiceEndResponse = false; - private boolean rpcProtectedResponseReceived = false; - private boolean rpcProtectedStartResponse = false; - BaseLifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener){ + BaseLifecycleManager(AppConfig appConfig, LifecycleListener listener){ this.lifecycleListener = listener; this.rpcListeners = new HashMap<>(); 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 e3c45516a..0cd661268 100644 --- a/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java +++ b/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java @@ -43,8 +43,8 @@ import com.smartdevicelink.transport.BaseTransportConfig; */ @RestrictTo(RestrictTo.Scope.LIBRARY) public class LifecycleManager extends BaseLifecycleManager { - public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener){ - super(appConfig, config, listener); + public LifecycleManager(AppConfig appConfig, BaseTransportConfig config, LifecycleListener listener) { + super(appConfig, listener); this.session = new SdlSession(sdlConnectionListener, config); } } |