Merge branch 'develop' of https://github.com/smartdevicelink/sdl_android into feature/refactor_samples

3 files changed, 0 insertions, 27 deletions

diff --git a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
index 0c1b87c6a..c619b46fb 100644
--- a/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
+++ b/javaSE/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
@@ -136,11 +136,6 @@ public class SdlService {
                 }
 
                 @Override
-                public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language) {
-                    return null;
-                }
-
-                @Override
                 public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language, Language hmiLanguage) {
                     boolean isNeedUpdate = false;
                     String appName = APP_NAME;
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
index 8118a9c93..43aad3161 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
@@ -60,21 +60,6 @@ public interface SdlManagerListener extends BaseSdlManagerListener {
 	 * of LifecycleConfigurationUpdate, otherwise it should return null to indicate that the language
 	 * is not supported.
 	 *
-	 * @param language The language of the connected head unit the manager is trying to update the configuration.
-	 * @return An object of LifecycleConfigurationUpdate if the head unit language is supported,
-	 * otherwise null to indicate that the language is not supported.
-	 * @deprecated use {@link #managerShouldUpdateLifecycle(Language language, Language hmiLanguage)} instead
-	 */
-	@Deprecated
-	LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language);
-
-	/**
-	 * Called when the SDL manager detected a language mismatch. In case of a language mismatch the
-	 * manager should change the apps registration by updating the lifecycle configuration to the
-	 * specified language. If the app can support the specified language it should return an Object
-	 * of LifecycleConfigurationUpdate, otherwise it should return null to indicate that the language
-	 * is not supported.
-	 *
 	 * @param language The VR+TTS language of the connected head unit the manager is trying to update the configuration.
 	 * @param hmiLanguage The HMI display language of the connected head unit the manager is trying to update the configuration.
 	 * @return An object of LifecycleConfigurationUpdate if the head unit language is supported,
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java
index 54896f273..b4a92ddb6 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/managers/file/FileManager.java
@@ -60,13 +60,6 @@ import java.net.URI;
  */
 public class FileManager extends BaseFileManager {
 
-	@Deprecated
-	public FileManager(ISdl internalInterface) {
-
-		// setup
-		super(internalInterface);
-	}
-
 	/**
 	 * Constructor for FileManager
 	 * @param internalInterface an instance of the ISdl interface that can be used for common SDL operations (sendRpc, addRpcListener, etc)