diff options
| author | RHenigan <heniganr1@gmail.com> | 2020-09-15 15:56:01 -0400 |
|---|---|---|
| committer | RHenigan <heniganr1@gmail.com> | 2020-09-15 15:56:01 -0400 |
| commit | 99e029d73c679686fd0d699ee36c9075d8e50700 (patch) | |
| tree | 20ede88ae054536cc7f1cd47fe64847dc900fb5b /javaSE | |
| parent | 250a2e6b4f414979b6bf70a7b2f77ce4cfdf7be7 (diff) | |
| parent | 67856b764fd275f0f8ccaeb9db839164faceb75d (diff) | |
| download | sdl_android-99e029d73c679686fd0d699ee36c9075d8e50700.tar.gz | |
Merge branch 'develop' into feature/move_proxy_interfaces
Diffstat (limited to 'javaSE')
| -rw-r--r-- | javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java | 2 | ||||
| -rw-r--r-- | javaSE/javaSE/src/main/java/com/smartdevicelink/session/SdlSession.java (renamed from javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java index b7167b81c..89c9f3190 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/lifecycle/LifecycleManager.java @@ -34,7 +34,7 @@ package com.smartdevicelink.managers.lifecycle; import androidx.annotation.RestrictTo; -import com.smartdevicelink.SdlConnection.SdlSession; +import com.smartdevicelink.session.SdlSession; import com.smartdevicelink.exception.SdlException; import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason; import com.smartdevicelink.transport.BaseTransportConfig; diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/session/SdlSession.java index 077926903..4aaef8985 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/session/SdlSession.java @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -package com.smartdevicelink.SdlConnection; +package com.smartdevicelink.session; import androidx.annotation.RestrictTo; |