Update SdlManager state after disposing it

2 files changed, 5 insertions, 0 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
index bdba58a6a..ea1e88dcc 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -287,6 +287,8 @@ public class SdlManager extends BaseSdlManager{
 			managerListener.onDestroy();
 			managerListener = null;
 		}
+
+		transitionToState(BaseSubManager.SHUTDOWN);
 	}
 
 	// MANAGER GETTERS
@@ -589,6 +591,7 @@ public class SdlManager extends BaseSdlManager{
 				initNotificationQueue();
 
 			} catch (SdlException e) {
+				transitionToState(BaseSubManager.ERROR);
 				if (managerListener != null) {
 					managerListener.onError("Unable to start manager", e);
 				}
diff --git a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
index 4c1b15398..146382de9 100644
--- a/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
+++ b/javaSE/src/main/java/com/smartdevicelink/managers/SdlManager.java
@@ -242,6 +242,8 @@ public class SdlManager extends BaseSdlManager{
 			managerListener.onDestroy(this);
 			managerListener = null;
 		}
+
+		transitionToState(BaseSubManager.SHUTDOWN);
 	}