Merge branch 'feature/issue_782_Android_Managers' into feature/sdlmanager_tests

1 files changed, 12 insertions, 7 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/BaseSubManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/BaseSubManager.java
index 0096621e0..ac7e020f9 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/BaseSubManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/BaseSubManager.java
@@ -16,27 +16,32 @@ import com.smartdevicelink.proxy.interfaces.ISdl;
 public abstract class BaseSubManager {
 
 	// states - if this gets more complicated we can move elsewhere
-	public int state, SETTING_UP = 0x00, READY = 0x30, SHUTDOWN = 0x60;
-
+	private int state;
+	private final Object STATE_LOCK = new Object();
+	public static final int SETTING_UP = 0x00, READY = 0x30, SHUTDOWN = 0x60;
 	protected final ISdl internalInterface;
 
 	public BaseSubManager(@NonNull ISdl internalInterface){
 		this.internalInterface = internalInterface;
-		this.state = SETTING_UP;
+		transitionToState(SETTING_UP);
 	}
 
 	/**
 	 * <p>Called when manager is being torn down</p>
 	 */
 	public void dispose(){
-		this.state = SHUTDOWN;
+		transitionToState(SHUTDOWN);
 	}
 
 	protected void transitionToState(int state) {
-		this.state = state;
+		synchronized (STATE_LOCK) {
+			this.state = state;
+		}
 	}
 
-	protected int getState() {
-		return state;
+	public int getState() {
+		synchronized (STATE_LOCK) {
+			return state;
+		}
 	}
 }