manually merge sdlmanagerfeature/lockscreen_manager

1 files changed, 31 insertions, 12 deletions

diff --git a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
index 50eb3844a..075664b34 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/api/SdlManager.java
@@ -5,6 +5,8 @@ import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.smartdevicelink.api.PermissionManager.PermissionManager;
+import com.smartdevicelink.api.lockscreen.LockScreenConfig;
+import com.smartdevicelink.api.lockscreen.LockScreenManager;
 import com.smartdevicelink.exception.SdlException;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
@@ -69,7 +71,7 @@ public class SdlManager{
 
 	private SdlManagerListener managerListener;
 	private int state = -1;
-	//public LockScreenConfig lockScreenConfig;
+	public LockScreenConfig lockScreenConfig;
 
 
 	// Managers
@@ -77,9 +79,9 @@ public class SdlManager{
 	private PermissionManager permissionManager;
 	private VideoStreamingManager videoStreamingManager;
 	private FileManager fileManager;
+	private LockScreenManager lockscreenManager;
     /*
     private AudioStreamManager audioStreamManager;
-    private LockscreenManager lockscreenManager;
     private ScreenManager screenManager;
     */
 
@@ -122,10 +124,10 @@ public class SdlManager{
 			if(
 					permissionManager != null && permissionManager.getState() != BaseSubManager.SETTING_UP &&
 					fileManager != null && fileManager.getState() != BaseSubManager.SETTING_UP &&
-					(videoStreamingManager == null || (videoStreamingManager != null && videoStreamingManager.getState() != BaseSubManager.SETTING_UP))
+					(videoStreamingManager == null || (videoStreamingManager != null && videoStreamingManager.getState() != BaseSubManager.SETTING_UP)) &&
+							lockscreenManager != null &&  lockscreenManager.getState() != BaseSubManager.SETTING_UP
 					/*
 					audioStreamManager != null && audioStreamManager.getState() != BaseSubManager.SETTING_UP &&
-					lockscreenManager != null &&  lockscreenManager.getState() != BaseSubManager.SETTING_UP &&
 					screenManager != null && screenManager.getState() != BaseSubManager.SETTING_UP
 					*/
 					){
@@ -150,9 +152,13 @@ public class SdlManager{
 
 		this.fileManager = new FileManager(_internalInterface, context);
 		this.fileManager.start(subManagerListener);
+
+		if (lockScreenConfig.isEnabled()) {
+			this.lockscreenManager = new LockScreenManager(lockScreenConfig, context, _internalInterface);
+			this.lockscreenManager.start(subManagerListener);
+		}
+
 		/*
-		this.lockscreenManager = new LockscreenManager(lockScreenConfig, context, _internalInterface);
-		this.lockscreenManager.start(subManagerListener);
 		this.screenManager = new ScreenManager(_internalInterface, this.fileManager);
 		this.screenManager.start(subManagerListener);
 		this.audioStreamManager = new AudioStreamManager(_internalInterface);
@@ -166,8 +172,12 @@ public class SdlManager{
 			this.videoStreamingManager.dispose();
 		}
 		this.fileManager.dispose();
+
+		if (this.lockscreenManager != null) {
+			this.lockscreenManager.dispose();
+		}
+
 		/*
-		this.lockscreenManager.dispose();
 		this.audioStreamManager.dispose();
 		this.screenManager.dispose();
 		this.audioStreamManager.dispose();
@@ -260,11 +270,15 @@ public class SdlManager{
 			return this;
 		}
 
-		/*
+		/**
+		 * Sets the LockScreenConfig for the session. <br>
+		 * <strong>Note: If not set, the default configuration will be used.</strong>
+		 * @param lockScreenConfig - configuration options
+		 */
 		public Builder setLockScreenConfig (final LockScreenConfig lockScreenConfig){
 			sdlManager.lockScreenConfig = lockScreenConfig;
 			return this;
-		}*/
+		}
 
 		/**
 		 * Sets the vector of AppHMIType <br>
@@ -349,6 +363,11 @@ public class SdlManager{
 				sdlManager.isMediaApp = false;
 			}
 
+			if (sdlManager.lockScreenConfig == null){
+				// if lock screen params are not set, use default
+				sdlManager.lockScreenConfig = new LockScreenConfig();
+			}
+
 			if (sdlManager.hmiLanguage == null){
 				sdlManager.hmiLanguage = Language.EN_US;
 			}
@@ -429,12 +448,10 @@ public class SdlManager{
 	 * <strong>Note: LockScreenManager should be used only after SdlManager.start() CompletionListener callback is completed successfully.</strong>
 	 * @return a LockScreenManager object
 	 */
-    /*
-	public LockscreenManager getLockscreenManager() {
+	public LockScreenManager getLockscreenManager() {
 		checkSdlManagerState();
 		return lockscreenManager;
 	}
-	*/
 
 
 	// PROTECTED GETTERS
@@ -459,6 +476,8 @@ public class SdlManager{
 
 	protected BaseTransportConfig getTransport() { return transport; }
 
+	protected LockScreenConfig getLockScreenConfig() { return lockScreenConfig; }
+
 	// SENDING REQUESTS
 
 	/**