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

34 files changed, 96 insertions, 896 deletions

diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
index 893525b97..fbfcfdabc 100755
--- a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
@@ -203,11 +203,6 @@ public class SdlService extends Service {
 				}
 
 				@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/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
index 7c4fb11ff..97361adc9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/SdlManagerTests.java
@@ -112,11 +112,6 @@ public class SdlManagerTests {
 			}
 
 			@Override
-			public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language) {
-				return null;
-			}
-
-			@Override
 			public LifecycleConfigurationUpdate managerShouldUpdateLifecycle(Language language, Language hmiLanguage) {
 				return null;
 			}
@@ -222,7 +217,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenConfig().setEnabled(true);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.READY, sdlManager.getState());
@@ -232,7 +227,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenConfig().setEnabled(false);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.READY, sdlManager.getState());
@@ -242,7 +237,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getLockScreenConfig().setEnabled(true);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.ERROR, sdlManager.getState());
@@ -252,7 +247,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getLockScreenConfig().setEnabled(false);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.ERROR, sdlManager.getState());
@@ -262,7 +257,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.getLockScreenConfig().setEnabled(true);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.LIMITED);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.SETTING_UP, sdlManager.getState());
@@ -272,7 +267,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.SETTING_UP);
-		sdlManager.getLockScreenConfig().setEnabled(false);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.SETTING_UP, sdlManager.getState());
@@ -282,7 +277,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenConfig().setEnabled(true);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
@@ -292,7 +287,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.ERROR);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.READY);
-		sdlManager.getLockScreenConfig().setEnabled(false);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
@@ -302,7 +297,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.LIMITED);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getLockScreenConfig().setEnabled(true);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.READY);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
@@ -312,7 +307,7 @@ public class SdlManagerTests {
 		sdlManager.getPermissionManager().transitionToState(BaseSubManager.READY);
 		sdlManager.getFileManager().transitionToState(BaseSubManager.LIMITED);
 		sdlManager.getScreenManager().transitionToState(BaseSubManager.ERROR);
-		sdlManager.getLockScreenConfig().setEnabled(false);
+		sdlManager.getLockScreenConfig().setDisplayMode(LockScreenConfig.DISPLAY_MODE_NEVER);
 		sdlManager.getLockScreenManager().transitionToState(BaseSubManager.SETTING_UP);
 		sdlManager.checkState();
 		assertEquals(BaseSubManager.LIMITED, sdlManager.getState());
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
index 4cfa806ad..c5837c2cb 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java
@@ -232,11 +232,6 @@ public class AudioStreamManagerTest extends TestCase {
             }

 

             @Override

-            public void sendAudio(ByteBuffer data, long presentationTimeUs) {

-                sendAudio(data, presentationTimeUs, null);

-            }

-

-            @Override

             public void sendAudio(ByteBuffer data, long presentationTimeUs, CompletionListener listener) {

                 SampleBuffer samples = SampleBuffer.wrap(data, sampleType, presentationTimeUs);

                 double timeUs = presentationTimeUs;

@@ -478,11 +473,6 @@ public class AudioStreamManagerTest extends TestCase {
             }

 

             @Override

-            public void sendAudio(ByteBuffer data, long presentationTimeUs) {

-                sendAudio(data, presentationTimeUs, null);

-            }

-

-            @Override

             public void sendAudio(ByteBuffer data, long presentationTimeUs, CompletionListener listener) {

                 try {

                     long length = data.limit();

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
index d99e3e228..109bf6316 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lifecycle/SystemCapabilityManagerTests.java
@@ -183,25 +183,25 @@ public class SystemCapabilityManagerTests {
 
 		List<DisplayCapability> displayCapabilityList = createDisplayCapabilityList(TestValues.GENERAL_DISPLAYCAPABILITIES, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);
 		assertTrue(TestValues.TRUE,
-				Validator.validateDisplayCapabilityList(displayCapabilityList, (List<DisplayCapability>) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS)));
+				Validator.validateDisplayCapabilityList(displayCapabilityList, (List<DisplayCapability>) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validateHMICapabilities(TestValues.GENERAL_HMICAPABILITIES, (HMICapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.HMI)));
+				Validator.validateHMICapabilities(TestValues.GENERAL_HMICAPABILITIES, (HMICapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.HMI, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, (DisplayCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY)));
+				Validator.validateDisplayCapabilities(TestValues.GENERAL_DISPLAYCAPABILITIES, (DisplayCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validateAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST, (List<AudioPassThruCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.AUDIO_PASSTHROUGH)));
+				Validator.validateAudioPassThruCapabilities(TestValues.GENERAL_AUDIOPASSTHRUCAPABILITIES_LIST, (List<AudioPassThruCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.AUDIO_PASSTHROUGH, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, (List<ButtonCapabilities> )systemCapabilityManager.getCapability(SystemCapabilityType.BUTTON)));
+				Validator.validateButtonCapabilities(TestValues.GENERAL_BUTTONCAPABILITIES_LIST, (List<ButtonCapabilities> )systemCapabilityManager.getCapability(SystemCapabilityType.BUTTON, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validateHMIZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST, (List<HmiZoneCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.HMI_ZONE)));
+				Validator.validateHMIZoneCapabilities(TestValues.GENERAL_HMIZONECAPABILITIES_LIST, (List<HmiZoneCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.HMI_ZONE, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, (PresetBankCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.PRESET_BANK)));
+				Validator.validatePresetBankCapabilities(TestValues.GENERAL_PRESETBANKCAPABILITIES, (PresetBankCapabilities) systemCapabilityManager.getCapability(SystemCapabilityType.PRESET_BANK, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validateSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST, (List<SoftButtonCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON)));
+				Validator.validateSoftButtonCapabilities(TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST, (List<SoftButtonCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validateSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST, (List<SpeechCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.SPEECH)));
+				Validator.validateSpeechCapabilities(TestValues.GENERAL_SPEECHCAPABILITIES_LIST, (List<SpeechCapabilities>) systemCapabilityManager.getCapability(SystemCapabilityType.SPEECH, null, false)));
 		assertTrue(TestValues.TRUE,
-				Validator.validatePreRecordedSpeechCapabilities(TestValues.GENERAL_PRERECORDEDSPEECH_LIST, (List<PrerecordedSpeech>) systemCapabilityManager.getCapability(SystemCapabilityType.PRERECORDED_SPEECH)));
+				Validator.validatePreRecordedSpeechCapabilities(TestValues.GENERAL_PRERECORDEDSPEECH_LIST, (List<PrerecordedSpeech>) systemCapabilityManager.getCapability(SystemCapabilityType.PRERECORDED_SPEECH, null, false)));
 
 	}
 
@@ -256,7 +256,7 @@ public class SystemCapabilityManagerTests {
 			public void onError(String info) {
 				assertTrue(false);
 			}
-		});
+		}, false);
 	}
 
 	private Answer<Void> createOnHMIStatusAnswer(final HMILevel hmiLevel){
@@ -687,7 +687,7 @@ public class SystemCapabilityManagerTests {
 	@Test
 	public void testListConversion(){
 		SystemCapabilityManager systemCapabilityManager = createSampleManager();
-		Object capability = systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON);
+		Object capability = systemCapabilityManager.getCapability(SystemCapabilityType.SOFTBUTTON, null, false);
 		assertNotNull(capability);
 		List<SoftButtonCapabilities> list = SystemCapabilityManager.convertToList(capability, SoftButtonCapabilities.class);
 		assertNotNull(list);
@@ -707,7 +707,7 @@ public class SystemCapabilityManagerTests {
 		OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
 		assertNotNull(scmRpcListener);
 
-		assertNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES));
+		assertNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false));
 
 		/* PERFORM A NOTIFICATION SEND THROUGH THE SCM */
 		AppServiceCapability addServiceID = AppServiceFactory.createAppServiceCapability(AppServiceType.NAVIGATION, "test", "3453", true, null);
@@ -723,7 +723,7 @@ public class SystemCapabilityManagerTests {
 
 		scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES));
+		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false));
 	}
 
 	@Test
@@ -733,8 +733,8 @@ public class SystemCapabilityManagerTests {
 		OnRPCListener scmRpcListener = iSDL.rpcListeners.get(FunctionID.ON_SYSTEM_CAPABILITY_UPDATED.getId()).get(0);
 		assertNotNull(scmRpcListener);
 
-		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS));
-		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY));
+		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false));
+		assertNotNull(systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false));
 
 		List<DisplayCapability> newCaps = createDisplayCapabilityList(TestValues.GENERAL_DISPLAYCAPABILITIES, TestValues.GENERAL_BUTTONCAPABILITIES_LIST, TestValues.GENERAL_SOFTBUTTONCAPABILITIES_LIST);;
 
@@ -747,11 +747,11 @@ public class SystemCapabilityManagerTests {
 
 		scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		List<DisplayCapability> appliedCaps = (List<DisplayCapability>)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS);
+		List<DisplayCapability> appliedCaps = (List<DisplayCapability>)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false);
 		assertNotNull(appliedCaps);
 		assertTrue(Validator.validateDisplayCapabilityList(newCaps, appliedCaps));
 
-		DisplayCapabilities appliedConvertedCaps = (DisplayCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY);
+		DisplayCapabilities appliedConvertedCaps = (DisplayCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false);
 		assertNotNull(appliedConvertedCaps);
 		DisplayCapabilities testConvertedCaps = createDisplayCapabilities(newCaps.get(0).getDisplayName(), newCaps.get(0).getWindowCapabilities().get(0));
 		assertTrue(Validator.validateDisplayCapabilities(appliedConvertedCaps, testConvertedCaps));
@@ -772,13 +772,13 @@ public class SystemCapabilityManagerTests {
 		assertNotNull(scmRpcListener);
 
 		/* CONFIRM THE CAP DOESN'T EXIST IN SCM */
-		AppServicesCapabilities cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES);
+		AppServicesCapabilities cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
 		assertNull(cachedCap);
 
 		/* ADD THE CAP IN SCM */
 		systemCapabilityManager.setCapability(SystemCapabilityType.APP_SERVICES, appServicesCapabilities);
 		/* CONFIRM THE CAP DOES EXIST IN SCM */
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES);
+		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
 		assertNotNull(cachedCap);
 		/* CONFIRM THE CAP IN SCM EQUALS ORIGINAL*/
 		assertEquals(cachedCap, appServicesCapabilities);
@@ -798,7 +798,7 @@ public class SystemCapabilityManagerTests {
 
 		scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES);
+		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
 		assertNotNull(cachedCap);
 
 		assertTrue(cachedCap.getAppServices().get(0).getUpdatedAppServiceRecord().getServiceID().equals(baseID));
@@ -823,7 +823,7 @@ public class SystemCapabilityManagerTests {
 
 		scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES);
+		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
 		assertNotNull(cachedCap);
 		assertEquals(cachedCap.getAppServices().size(), 1);
 
@@ -842,7 +842,7 @@ public class SystemCapabilityManagerTests {
 
 		scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES);
+		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
 		assertNotNull(cachedCap);
 		assertEquals(cachedCap.getAppServices().size(), 2);
 
@@ -861,7 +861,7 @@ public class SystemCapabilityManagerTests {
 
 		scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES);
+		cachedCap = (AppServicesCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.APP_SERVICES, null, false);
 		assertNotNull(cachedCap);
 		assertEquals(cachedCap.getAppServices().size(), 1);
 
@@ -876,7 +876,7 @@ public class SystemCapabilityManagerTests {
 		assertNotNull(scmRpcListener);
 		systemCapabilityManager.setCapability(SystemCapabilityType.PHONE_CALL, TestValues.GENERAL_PHONECAPABILITY);
 
-		PhoneCapability phoneCapability = (PhoneCapability)systemCapabilityManager.getCapability(SystemCapabilityType.PHONE_CALL);
+		PhoneCapability phoneCapability = (PhoneCapability)systemCapabilityManager.getCapability(SystemCapabilityType.PHONE_CALL, null, false);
 		assertNotNull(phoneCapability);
 		assertEquals(phoneCapability, TestValues.GENERAL_PHONECAPABILITY);
 
@@ -889,7 +889,7 @@ public class SystemCapabilityManagerTests {
 
 		scmRpcListener.onReceived(onSystemCapabilityUpdated);
 
-		PhoneCapability phoneCapabilityUpdated = (PhoneCapability)systemCapabilityManager.getCapability(SystemCapabilityType.PHONE_CALL);
+		PhoneCapability phoneCapabilityUpdated = (PhoneCapability)systemCapabilityManager.getCapability(SystemCapabilityType.PHONE_CALL, null, false);
 		assertNotNull(phoneCapabilityUpdated);
 		assertFalse(phoneCapabilityUpdated.getDialNumberEnabled());
 		assertEquals(phoneCapability, phoneCapabilityUpdated);
@@ -913,11 +913,11 @@ public class SystemCapabilityManagerTests {
 		dlRpcListener.onReceived(newLayout);
 
 
-		DisplayCapabilities appliedCaps = (DisplayCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY);
+		DisplayCapabilities appliedCaps = (DisplayCapabilities)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAY, null, false);
 		assertNotNull(appliedCaps);
 		assertTrue(Validator.validateDisplayCapabilities(newLayout.getDisplayCapabilities(), appliedCaps));
 
-		List<DisplayCapability> convertedCaps = (List<DisplayCapability>)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS);
+		List<DisplayCapability> convertedCaps = (List<DisplayCapability>)systemCapabilityManager.getCapability(SystemCapabilityType.DISPLAYS, null, false);
 		assertNotNull(convertedCaps);
 		List<DisplayCapability> testCaps = createDisplayCapabilityList(newLayout.getDisplayCapabilities(), newLayout.getButtonCapabilities(), newLayout.getSoftButtonCapabilities());
 		assertTrue(Validator.validateDisplayCapabilityList(convertedCaps, testCaps));
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
index 84a4e52ef..500680e02 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenConfigTests.java
@@ -30,7 +30,6 @@ public class LockScreenConfigTests {
 		lockScreenConfig.setAppIcon(TestValues.GENERAL_INT);
 		lockScreenConfig.setBackgroundColor(TestValues.GENERAL_INT);
 		lockScreenConfig.showDeviceLogo(true);
-		lockScreenConfig.setEnabled(true);
 		lockScreenConfig.setDisplayMode(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED);
 	}
 
@@ -41,7 +40,6 @@ public class LockScreenConfigTests {
 		assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getCustomView());
 		assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getAppIcon());
 		assertEquals(TestValues.GENERAL_INT, lockScreenConfig.getBackgroundColor());
-		assertTrue(lockScreenConfig.isEnabled());
 		assertTrue(lockScreenConfig.isDeviceLogoEnabled());
 		assertEquals(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED, lockScreenConfig.getDisplayMode());
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
index 2509a2298..6baf9f7ee 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/lockscreen/LockScreenManagerTests.java
@@ -60,7 +60,6 @@ public class LockScreenManagerTests {
 		lockScreenConfig.setAppIcon(TestValues.GENERAL_INT);
 		lockScreenConfig.setBackgroundColor(TestValues.GENERAL_INT);
 		lockScreenConfig.showDeviceLogo(true);
-		lockScreenConfig.setEnabled(true);
 		lockScreenConfig.setDisplayMode(LockScreenConfig.DISPLAY_MODE_OPTIONAL_OR_REQUIRED);
 
 		lockScreenManager = new LockScreenManager(lockScreenConfig, context, internalInterface);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
index bd82d2d5d..2b721db7c 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
@@ -1031,7 +1031,7 @@ public class TestValues {
 
 		GENERAL_LOCKSCREENCONFIG.setAppIcon(R.drawable.sdl_lockscreen_icon);
 		GENERAL_LOCKSCREENCONFIG.setBackgroundColor(Color.BLUE);
-		GENERAL_LOCKSCREENCONFIG.setEnabled(true);
+		GENERAL_LOCKSCREENCONFIG.setDisplayMode(LockScreenConfig.DISPLAY_MODE_ALWAYS);
 		GENERAL_LOCKSCREENCONFIG.setCustomView(R.layout.activity_sdllock_screen);
 		GENERAL_CLOUDAPPPROPERTIES.setNicknames(GENERAL_STRING_LIST);
 		GENERAL_CLOUDAPPPROPERTIES.setAppID(GENERAL_STRING);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
index 28b1520d2..0cccc48e8 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/AbstractPacketizerTests.java
@@ -32,14 +32,11 @@ public class AbstractPacketizerTests extends TestCase {
 		
 		// Test Values
 		byte            testSessionId    = (byte) 0x0A;
-		byte            testWiproVersion = (byte) 0x0B;
-		RPCRequest      testRpcRequest   = new RPCRequest("test");
 		SessionType     testSessionType  = SessionType.RPC;
 		SdlSession      testSdlSession  = null;
 		InputStream     testInputStream  = null;
 		MockPacketizer  testPacketizer1  = null;
 		MockPacketizer  testPacketizer2  = null;
-		MockPacketizer  testPacketizer3  = null;
 		IStreamListener testListener     = new MockStreamListener();
 		try {
 			testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
@@ -48,31 +45,15 @@ public class AbstractPacketizerTests extends TestCase {
 			testSdlSession = new SdlSession(interfaceBroker, transportConfig);
 			testPacketizer1 = new MockPacketizer(testListener, testInputStream, testSessionType, testSessionId, testSdlSession);
 			testPacketizer2 = new MockPacketizer(null, null, null, testSessionId, testSdlSession);
-			testPacketizer3 = new MockPacketizer(testListener, testInputStream, testRpcRequest, testSessionType, testSessionId, testWiproVersion, testSdlSession);
-			try {
-				new MockPacketizer(null, null, null, null, testSessionId, testWiproVersion, null);
-				fail("Exception should be thrown");
-			}catch(Exception e) {
-				assertTrue(e instanceof IllegalArgumentException);
-			}
 
-			
 			// Valid Tests
 			assertNotNull(TestValues.NOT_NULL, testPacketizer1);
 			assertNotNull(TestValues.NOT_NULL, testPacketizer2);
-			assertNotNull(TestValues.NOT_NULL, testPacketizer3);
-			
+
 			assertEquals(TestValues.MATCH, testListener, testPacketizer1.getListener());
 			assertEquals(TestValues.MATCH, testInputStream, testPacketizer1.getInputStream());
 			assertEquals(TestValues.MATCH, testSessionType, testPacketizer1.getSessionType());
 			assertEquals(TestValues.MATCH, testSessionId, testPacketizer1.getSessionId());
-			assertEquals(TestValues.MATCH, testListener, testPacketizer3.getListener());
-			assertEquals(TestValues.MATCH, testInputStream, testPacketizer3.getInputStream());
-			assertEquals(TestValues.MATCH, testSessionType, testPacketizer3.getSessionType());
-			assertEquals(TestValues.MATCH, testSessionId, testPacketizer3.getSessionId());
-			assertEquals(TestValues.MATCH, testWiproVersion, testPacketizer3.getWiproVersion());
-			assertEquals(TestValues.MATCH, testRpcRequest.getFunctionName(), testPacketizer3.getRPCRequest().getFunctionName());
-			assertEquals(TestValues.MATCH, testSdlSession, testPacketizer3.getSdlSession());
 						
 			// Invalid/Null Tests
 			assertNull(TestValues.NULL, testPacketizer2.getListener());
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
index 2c6618f62..ca6a77820 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/MockPacketizer.java
@@ -2,10 +2,8 @@ package com.smartdevicelink.test.streaming;
 
 import com.smartdevicelink.SdlConnection.SdlSession;
 import com.smartdevicelink.protocol.enums.SessionType;
-import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.streaming.AbstractPacketizer;
 import com.smartdevicelink.streaming.IStreamListener;
-import com.smartdevicelink.util.Version;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,8 +14,6 @@ import java.io.InputStream;
  */
 public class MockPacketizer extends AbstractPacketizer {
 	public MockPacketizer (IStreamListener l, InputStream i, SessionType s, byte sid, SdlSession sdlsession) throws IOException { super (l, i, s, sid, sdlsession); }
-	public MockPacketizer (IStreamListener l, InputStream i, RPCRequest r, SessionType s, byte sid, Version protocolVersion,SdlSession sdlsession) throws IOException { super (l, i, r, s, sid, protocolVersion, sdlsession); }
-	public MockPacketizer (IStreamListener l, InputStream i, RPCRequest r, SessionType s, byte sid, byte w, SdlSession sdlsession) throws IOException { super (l, i, r, s, sid, w, sdlsession); }
 
 	@Override public void start() throws IOException { }
 	@Override public void stop() { }
@@ -25,12 +21,7 @@ public class MockPacketizer extends AbstractPacketizer {
 	public IStreamListener getListener () { return _streamListener; }
 	public InputStream getInputStream  () { return is;              }
 	public SessionType getSessionType  () { return _serviceType;    }
-	public SdlSession getSdlSession    () { return _session;    	}
 	public byte getSessionId           () { return _rpcSessionID;   }
-	public RPCRequest getRPCRequest    () { return _request;        }
-	@Deprecated
-	public byte getWiproVersion        () { if(_wiproVersion != null){return (byte)_wiproVersion.getMajor(); }else{return 5;}}
-	public Version getProtocolVersion  () { return _wiproVersion;   }
 
 	@Override public void pause() { }
 	@Override public void resume() { }
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
deleted file mode 100644
index 05a579b72..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/StreamRPCPacketizerTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.smartdevicelink.test.streaming;
-
-import com.smartdevicelink.SdlConnection.SdlSession;
-import com.smartdevicelink.protocol.enums.SessionType;
-import com.smartdevicelink.proxy.RPCRequest;
-import com.smartdevicelink.streaming.IStreamListener;
-import com.smartdevicelink.streaming.StreamRPCPacketizer;
-import com.smartdevicelink.test.TestValues;
-import com.smartdevicelink.transport.MultiplexTransportConfig;
-
-import junit.framework.TestCase;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.streaming.StreamRPCPacketizer}
- */
-public class StreamRPCPacketizerTests extends TestCase {
-		
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.streaming.StreamRPCPacketizer#StreamRPCPacketizer(Object, IStreamListener, InputStream, RPCRequest, SessionType, byte, byte, long, SdlSession)}
-	 */
-	public void testConstructor () {
-		
-		// Test Values
-		byte testSessionId           = (byte) 0x0A;
-		byte testWV                  = (byte) 0x0B;
-		RPCRequest  testRequest      = new RPCRequest("test");
-		SessionType testSessionType  = SessionType.RPC;
-		InputStream testInputStream  = null;
-		IStreamListener testListener = new MockStreamListener();
-		
-		MockInterfaceBroker interfaceBroker = new MockInterfaceBroker();
-		MultiplexTransportConfig transportConfig = new MultiplexTransportConfig(getInstrumentation().getTargetContext(),"19216801");
-		SdlSession testSdlSession = new SdlSession(interfaceBroker, transportConfig);
-		try {
-			testInputStream = new BufferedInputStream(new ByteArrayInputStream("sdl streaming test".getBytes()));
-			StreamRPCPacketizer testStreamRpcPacketizer = new StreamRPCPacketizer(null, testListener, testInputStream, testRequest, testSessionType, testSessionId, testWV, testWV, testSdlSession);
-			assertNotNull(TestValues.NOT_NULL, testStreamRpcPacketizer);
-			
-			// NOTE: Cannot test thread handling methods currently.
-			
-		} catch (IOException e) {
-			fail("IOException was thrown.");
-		}		
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
index 5867fee7f..a297a9626 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/video/VideoStreamingParametersTest.java
@@ -25,6 +25,7 @@ public class VideoStreamingParametersTest {
     private VideoStreamingParameters params;
     private VideoStreamingCapability capability;
     private ImageResolution preferredResolution;
+    private final String vehicleMake = "SDL";
 
     @Before
     public void setUp() {
@@ -39,7 +40,7 @@ public class VideoStreamingParametersTest {
         capability.setScale(null);
         capability.setPreferredResolution(preferredResolution);
 
-        params.update(capability);
+        params.update(capability, vehicleMake);
 
         int width = params.getResolution().getResolutionWidth();
         int height = params.getResolution().getResolutionHeight();
@@ -55,7 +56,7 @@ public class VideoStreamingParametersTest {
         capability.setScale(1.0);
         capability.setPreferredResolution(preferredResolution);
 
-        params.update(capability);
+        params.update(capability, vehicleMake);
 
         int width = params.getResolution().getResolutionWidth();
         int height = params.getResolution().getResolutionHeight();
@@ -71,7 +72,7 @@ public class VideoStreamingParametersTest {
         capability.setScale(1.25);
         capability.setPreferredResolution(preferredResolution);
 
-        params.update(capability);
+        params.update(capability, vehicleMake);
 
         int width = params.getResolution().getResolutionWidth();
         int height = params.getResolution().getResolutionHeight();
@@ -87,7 +88,7 @@ public class VideoStreamingParametersTest {
         capability.setScale(1.5);
         capability.setPreferredResolution(preferredResolution);
 
-        params.update(capability);
+        params.update(capability, vehicleMake);
 
         int width = params.getResolution().getResolutionWidth();
         int height = params.getResolution().getResolutionHeight();
@@ -175,23 +176,23 @@ public class VideoStreamingParametersTest {
 
         assertNull(params.getFormat());
 
-        params.update(capability);
+        params.update(capability, vehicleMake);
 
         assertEquals(params.getFormat(), format);
 
         format = new VideoStreamingFormat(VideoStreamingProtocol.RTP, VideoStreamingCodec.H264);
         capability.setSupportedFormats(Collections.singletonList(format));
-        params.update(capability);
+        params.update(capability, vehicleMake);
         assertEquals(params.getFormat(), format);
 
         format = new VideoStreamingFormat(VideoStreamingProtocol.RTP, VideoStreamingCodec.H265);
         capability.setSupportedFormats(Collections.singletonList(format));
-        params.update(capability);
+        params.update(capability, vehicleMake);
         assertFalse(params.getFormat().equals(format));
 
         format = new VideoStreamingFormat(VideoStreamingProtocol.RAW, VideoStreamingCodec.VP8);
         capability.setSupportedFormats(Collections.singletonList(format));
-        params.update(capability);
+        params.update(capability, vehicleMake);
         assertFalse(params.getFormat().equals(format));
 
     }
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 42dc6a165..f109cbe85 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
@@ -124,7 +124,7 @@ public class SdlManager extends BaseSdlManager {
         // Instantiate sub managers
         this.permissionManager = new PermissionManager(_internalInterface);
         this.fileManager = new FileManager(_internalInterface, context, fileManagerConfig);
-        if (lockScreenConfig.isEnabled()) {
+        if (lockScreenConfig.getDisplayMode() != LockScreenConfig.DISPLAY_MODE_NEVER) {
             this.lockScreenManager = new LockScreenManager(lockScreenConfig, context, _internalInterface);
         }
         this.screenManager = new ScreenManager(_internalInterface, this.fileManager);
@@ -142,7 +142,7 @@ public class SdlManager extends BaseSdlManager {
         // Start sub managers
         this.permissionManager.start(subManagerListener);
         this.fileManager.start(subManagerListener);
-        if (lockScreenConfig.isEnabled()) {
+        if (lockScreenConfig.getDisplayMode() != LockScreenConfig.DISPLAY_MODE_NEVER) {
             this.lockScreenManager.start(subManagerListener);
         }
         this.screenManager.start(subManagerListener);
@@ -150,19 +150,19 @@ public class SdlManager extends BaseSdlManager {
 
     @Override
     void checkState() {
-        if (permissionManager != null && fileManager != null && screenManager != null && (!lockScreenConfig.isEnabled() || lockScreenManager != null)) {
-            if (permissionManager.getState() == BaseSubManager.READY && fileManager.getState() == BaseSubManager.READY && screenManager.getState() == BaseSubManager.READY && (!lockScreenConfig.isEnabled() || lockScreenManager.getState() == BaseSubManager.READY)) {
+        if (permissionManager != null && fileManager != null && screenManager != null && (lockScreenConfig.getDisplayMode() == LockScreenConfig.DISPLAY_MODE_NEVER || lockScreenManager != null)) {
+            if (permissionManager.getState() == BaseSubManager.READY && fileManager.getState() == BaseSubManager.READY && screenManager.getState() == BaseSubManager.READY && (lockScreenConfig.getDisplayMode() == LockScreenConfig.DISPLAY_MODE_NEVER || lockScreenManager.getState() == BaseSubManager.READY)) {
                 DebugTool.logInfo(TAG, "Starting sdl manager, all sub managers are in ready state");
                 transitionToState(BaseSubManager.READY);
                 handleQueuedNotifications();
                 notifyDevListener(null);
                 onReady();
-            } else if (permissionManager.getState() == BaseSubManager.ERROR && fileManager.getState() == BaseSubManager.ERROR && screenManager.getState() == BaseSubManager.ERROR && (!lockScreenConfig.isEnabled() || lockScreenManager.getState() == BaseSubManager.ERROR)) {
+            } else if (permissionManager.getState() == BaseSubManager.ERROR && fileManager.getState() == BaseSubManager.ERROR && screenManager.getState() == BaseSubManager.ERROR && (lockScreenConfig.getDisplayMode() == LockScreenConfig.DISPLAY_MODE_NEVER || lockScreenManager.getState() == BaseSubManager.ERROR)) {
                 String info = "ERROR starting sdl manager, all sub managers are in error state";
                 DebugTool.logError(TAG, info);
                 transitionToState(BaseSubManager.ERROR);
                 notifyDevListener(info);
-            } else if (permissionManager.getState() == BaseSubManager.SETTING_UP || fileManager.getState() == BaseSubManager.SETTING_UP || screenManager.getState() == BaseSubManager.SETTING_UP || (lockScreenConfig.isEnabled() && lockScreenManager != null && lockScreenManager.getState() == BaseSubManager.SETTING_UP)) {
+            } else if (permissionManager.getState() == BaseSubManager.SETTING_UP || fileManager.getState() == BaseSubManager.SETTING_UP || screenManager.getState() == BaseSubManager.SETTING_UP || (lockScreenConfig.getDisplayMode() != LockScreenConfig.DISPLAY_MODE_NEVER && lockScreenManager != null && lockScreenManager.getState() == BaseSubManager.SETTING_UP)) {
                 DebugTool.logInfo(TAG, "SETTING UP sdl manager, some sub managers are still setting up");
                 transitionToState(BaseSubManager.SETTING_UP);
                 // No need to notify developer here!
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
index aa0e4f84a..8bd1f6259 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManagerListener.java
@@ -61,21 +61,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/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
index bdd21ba45..f03c24084 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/file/FileManager.java
@@ -65,14 +65,6 @@ public class FileManager extends BaseFileManager {
 
 	private final WeakReference<Context> context;
 
-	@Deprecated
-	public FileManager(ISdl internalInterface, Context context) {
-
-		// setup
-		super(internalInterface);
-		this.context = new WeakReference<>(context);
-	}
-
 	/**
 	 * Constructor for FileManager
 	 * @param internalInterface an instance of the ISdl interface that can be used for common SDL operations (sendRpc, addRpcListener, etc)
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
index 8fe3286ba..8d1e9a6c8 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenConfig.java
@@ -88,30 +88,6 @@ public class LockScreenConfig {
 	}
 
 	/**
-	 * If set to true, SDL will manage the showing and dismissing of the lock screen for you. <br>
-	 *
-	 * If false, you must manage the lock screen
-	 * @param enable boolean
-	 *
-	 * @deprecated to disable the lockscreen, use setDisplayMode with DISPLAY_MODE_NEVER instead
-	 */
-	@Deprecated
-	public void setEnabled(boolean enable){
-		this.enable = enable;
-	}
-
-	/**
-	 * Gets whether the lock screen is being managed for you
-	 * @return boolean
-	 *
-	 * @deprecated to disable the lockscreen, use setDisplayMode with DISPLAY_MODE_NEVER instead
-	 */
-	@Deprecated
-	public boolean isEnabled() {
-		return enable;
-	}
-
-	/**
 	 * Set the resource int of the background color. Colors should define colors in your Colors.xml file
 	 * @param resourceColor resource int of the color
 	 */
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
index c5d567e56..48ab19960 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/lockscreen/LockScreenManager.java
@@ -96,7 +96,7 @@ public class LockScreenManager extends BaseSubManager {
 		lockScreenIcon = lockScreenConfig.getAppIcon();
 		lockScreenColor = lockScreenConfig.getBackgroundColor();
 		customView = lockScreenConfig.getCustomView();
-		lockScreenEnabled = lockScreenConfig.isEnabled();
+		lockScreenEnabled = lockScreenConfig.getDisplayMode() != LockScreenConfig.DISPLAY_MODE_NEVER;
 		deviceLogoEnabled = lockScreenConfig.isDeviceLogoEnabled();
 		displayMode = lockScreenConfig.getDisplayMode();
 		enableDismissGesture = lockScreenConfig.enableDismissGesture();
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
index accb59948..1a1ee4156 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java
@@ -237,17 +237,6 @@ public class StreamPacketizer extends AbstractPacketizer implements IVideoStream
 	/**

 	 * Called by the app.

 	 *

-	 * @see IAudioStreamListener#sendAudio(ByteBuffer, long)

-	 */

-	@Deprecated

-	@Override

-	public void sendAudio(ByteBuffer data, long presentationTimeUs) {

-		sendByteBufferData(data, null);

-	}

-

-	/**

-	 * Called by the app.

-	 *

 	 * @see IAudioStreamListener#sendAudio(ByteBuffer, long, CompletionListener)

 	 */

 	@Override

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
deleted file mode 100644
index 6d93205c1..000000000
--- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamRPCPacketizer.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*

- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- * Redistributions of source code must retain the above copyright notice, this

- * list of conditions and the following disclaimer.

- *

- * Redistributions in binary form must reproduce the above copyright notice,

- * this list of conditions and the following

- * disclaimer in the documentation and/or other materials provided with the

- * distribution.

- *

- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

- * software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-package com.smartdevicelink.streaming;

-

-import com.smartdevicelink.SdlConnection.SdlSession;

-import com.smartdevicelink.marshal.JsonRPCMarshaller;

-import com.smartdevicelink.protocol.ProtocolMessage;

-import com.smartdevicelink.protocol.enums.FunctionID;

-import com.smartdevicelink.protocol.enums.MessageType;

-import com.smartdevicelink.protocol.enums.SessionType;

-import com.smartdevicelink.proxy.RPCRequest;

-import com.smartdevicelink.proxy.RPCResponse;

-import com.smartdevicelink.proxy.interfaces.IPutFileResponseListener;

-import com.smartdevicelink.proxy.rpc.PutFile;

-import com.smartdevicelink.proxy.rpc.PutFileResponse;

-import com.smartdevicelink.util.Version;

-

-import java.io.IOException;

-import java.io.InputStream;

-

-@Deprecated

-public class StreamRPCPacketizer extends AbstractPacketizer implements IPutFileResponseListener, Runnable{

-

-	private Integer iInitialCorrID = 0;

-	//private Hashtable<Integer, OnStreamRPC> notificationList = new Hashtable<Integer, OnStreamRPC>();

-	private Thread thread = null;

-	private long lFileSize = 0;

-	private String sFileName;

-	private Object _proxy;

-	private Object _proxyListener;

-

-    private Object mPauseLock;

-    private boolean mPaused;

-    private boolean isRPCProtected = false;

-	//private OnPutFileUpdateListener callBack;

-

-	private Version rpcSpecVersion;

-

-	public StreamRPCPacketizer(Object proxy, IStreamListener streamListener, InputStream is, RPCRequest request, SessionType sType, byte rpcSessionID, byte wiproVersion, long lLength, SdlSession session) throws IOException {

-		super(streamListener, is, request, sType, rpcSessionID, wiproVersion, session);

-		lFileSize = lLength;

-		iInitialCorrID = request.getCorrelationID();

-        mPauseLock = new Object();

-        mPaused = false;

-        isRPCProtected = request.isPayloadProtected();

-		if (proxy != null)

-		{

-			_proxy = proxy;

-			//_proxyListener = _proxy.getProxyListener();

-			//_proxy.addPutFileResponseListener(this);

-		}

-		if(_request.getFunctionName().equalsIgnoreCase(FunctionID.PUT_FILE.toString())){

-			//callBack = ((PutFile)_request).getOnPutFileUpdateListener();

-		}

-	}

-

-	public StreamRPCPacketizer(Object proxy, IStreamListener streamListener, InputStream is, RPCRequest request, SessionType sType, byte rpcSessionID, Version wiproVersion, Version rpcSpecVersion, long lLength, SdlSession session) throws IOException {

-		super(streamListener, is, request, sType, rpcSessionID, wiproVersion, session);

-		this.rpcSpecVersion = rpcSpecVersion;

-		lFileSize = lLength;

-		iInitialCorrID = request.getCorrelationID();

-		mPauseLock = new Object();

-		mPaused = false;

-		isRPCProtected = request.isPayloadProtected();

-		if (proxy != null) {

-			_proxy = proxy;

-			//_proxyListener = _proxy.getProxyListener();

-			//_proxy.addPutFileResponseListener(this);

-		}

-		if(_request.getFunctionName().equalsIgnoreCase(FunctionID.PUT_FILE.toString())){

-			//callBack = ((PutFile)_request).getOnPutFileUpdateListener();

-		}

-	}

-

-	@Override

-	public void start() throws IOException {

-		if (thread == null) {

-			thread = new Thread(this);

-			thread.start();

-		}

-	}

-

-	@Override

-	public void stop() {

-		try {

-			is.close();

-		} catch (IOException ignore) {}

-		if (thread != null)

-		{

-			thread.interrupt();

-			thread = null;

-		}

-	}

-

-	private void handleStreamSuccess(RPCResponse rpc, Long iSize)

-	{

-//		StreamRPCResponse result = new StreamRPCResponse();

-//		result.setSuccess(rpc.getSuccess());

-//		result.setResultCode(rpc.getResultCode());

-//		result.setInfo(rpc.getInfo());

-//		result.setFileName(sFileName);

-//		result.setFileSize(iSize);

-//		result.setCorrelationID(iInitialCorrID);

-//		if (_proxyListener != null)

-//			_proxyListener.onStreamRPCResponse(result);

-//		stop();

-//		_proxy.remPutFileResponseListener(this);

-//		return;

-	}

-	

-	private void handleStreamException(RPCResponse rpc, Exception e, String error)

-	{

-//		StreamRPCResponse result = new StreamRPCResponse();

-//		result.setFileName(sFileName);

-//		result.setCorrelationID(iInitialCorrID);

-//		if (rpc != null)

-//		{

-//			result.setSuccess(rpc.getSuccess());

-//			result.setResultCode(rpc.getResultCode());

-//			result.setInfo(rpc.getInfo());

-//		}

-//		else

-//		{

-//			result.setSuccess(false);

-//			result.setResultCode(Result.GENERIC_ERROR);

-//			String sException = "";

-//

-//			if (e != null)

-//				sException = sException + " " + e.toString();

-//

-//			sException = sException + " " + error;

-//			result.setInfo(sException);

-//		}

-//		if (_proxyListener != null)

-//			_proxyListener.onStreamRPCResponse(result);

-//		if (e != null)

-//			e.printStackTrace();

-//		stop();

-//		_proxy.remPutFileResponseListener(this);

-//		return;

-	}

-

-    @Override

-	public void pause() {

-        synchronized (mPauseLock) {

-            mPaused = true;

-        }

-    }

-

-    @Override

-    public void resume() {

-        synchronized (mPauseLock) {

-            mPaused = false;

-            mPauseLock.notifyAll();

-        }

-    }

-

-    public void run() {

-		int length;

-		byte[] msgBytes;

-		ProtocolMessage pm;

-		//OnStreamRPC notification;

-		

-		// Moves the current Thread into the background

-		android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);

-

-		try {

-			

-			int iCorrID = 0;

-			PutFile msg = (PutFile) _request;

-			sFileName = msg.getSdlFileName();

-			long iOffsetCounter = msg.getOffset();

-			

-			int priorityCoefficient = 1;

-			

-			if (lFileSize != 0)

-			{

-				Long iFileSize = (long) lFileSize;

-				//TODO: PutFile RPC needs to be updated to accept Long as we might run into overflows since a Long can store a wider range than an Integer

-				msg.setLength(iFileSize);

-			}

-			Long iFileLength = msg.getLength();

-			

-			//notificationList.clear();

-			

-			//start reading from the stream at the given offset

-			long iSkipBytes = is.skip(iOffsetCounter);

-

-			if (iOffsetCounter != iSkipBytes)

-			{

-				handleStreamException(null,null," Error, PutFile offset invalid for file: " + sFileName);

-			}

-//			if(callBack!=null){

-//				callBack.onStart(_request.getCorrelationID(), lFileSize);

-//			}

-			while (!Thread.interrupted()) {				

-			

-				synchronized (mPauseLock)

-				{

-					while (mPaused)

-                    {

-						try

-                        {

-							mPauseLock.wait();

-                        }

-                        catch (InterruptedException e) {}

-                    }

-                }

-

-				length = is.read(buffer, 0, bufferSize);				

-				

-				if (length == -1)

-					stop();

-				

-				if (length >= 0) {

-			        

-					if (msg.getOffset() != 0)

-			        	msg.setLength((Long)null); //only need to send length when offset 0

-

-					msg.format(rpcSpecVersion,true);

-					msgBytes = JsonRPCMarshaller.marshall(msg, (byte)_wiproVersion.getMajor());

-					pm = new ProtocolMessage();

-					pm.setData(msgBytes);

-

-					pm.setSessionID(_rpcSessionID);

-					pm.setMessageType(MessageType.RPC);

-					pm.setSessionType(_serviceType);

-					pm.setFunctionID(FunctionID.getFunctionId(msg.getFunctionName()));

-					

-					if (buffer.length != length)

-						pm.setBulkData(buffer, length);

-					else

-						pm.setBulkDataNoCopy(buffer);

-

-					pm.setCorrID(msg.getCorrelationID());

-					pm.setPayloadProtected(isRPCProtected);

-					priorityCoefficient++;

-					pm.setPriorityCoefficient(priorityCoefficient);

-						

-//					notification = new OnStreamRPC();

-//					notification.setFileName(msg.getSdlFileName());

-//					notification.setFileSize(iFileLength);

-//			        iOffsetCounter = iOffsetCounter + length;

-//			        notification.setBytesComplete(iOffsetCounter);

-//			        notificationList.put(msg.getCorrelationID(),notification);

-			        

-			        msg.setOffset(iOffsetCounter);

-					iCorrID = msg.getCorrelationID() + 1;

-					msg.setCorrelationID(iCorrID);

-					

-			        _streamListener.sendStreamPacket(pm);

-				}

-			}

-		} catch (Exception e) {

-			handleStreamException(null, e, "");

-		}

-	}

-

-	@Override

-	public void onPutFileResponse(PutFileResponse response) 

-	{	

-		

-//		OnStreamRPC streamNote = notificationList.get(response.getCorrelationID());

-//		if (streamNote == null) return;

-//

-//		if (response.getSuccess())

-//		{

-//			if(callBack!=null){

-//				callBack.onUpdate(response.getCorrelationID(), streamNote.getBytesComplete(), lFileSize);

-//			}

-//			if (_proxyListener != null){

-//				_proxyListener.onOnStreamRPC(streamNote);

-//			}

-//

-//		}

-//		else

-//		{

-//			if(callBack!=null){

-//				callBack.onError(response.getCorrelationID(), response.getResultCode(), response.getInfo());

-//			}

-//			handleStreamException(response, null, "");

-//

-//		}

-//

-//		if (response.getSuccess() && streamNote.getBytesComplete().equals(streamNote.getFileSize()) )

-//		{

-//			if(callBack!=null){

-//				callBack.onResponse(iInitialCorrID, response, streamNote.getBytesComplete());

-//			}

-//			handleStreamSuccess(response, streamNote.getBytesComplete());

-//

-//		}

-	}

-

-	@Override

-	public void onPutFileStreamError(Exception e, String info) 

-	{

-		if (thread != null)

-			handleStreamException(null, e, info);

-		

-	}

-}

diff --git a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java
index 8332f9d0e..8e2b5b84d 100644
--- a/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/BaseSdlManager.java
@@ -178,17 +178,10 @@ abstract class BaseSdlManager {
 
         if ((actualLanguage != null && !actualLanguage.equals(language)) || (actualHMILanguage != null && !actualHMILanguage.equals(hmiLanguage))) {
 
-            LifecycleConfigurationUpdate lcuNew = managerListener.managerShouldUpdateLifecycle(actualLanguage, actualHMILanguage);
-            LifecycleConfigurationUpdate lcuOld = managerListener.managerShouldUpdateLifecycle(actualLanguage);
-            final LifecycleConfigurationUpdate lcu;
+            final LifecycleConfigurationUpdate lcu = managerListener.managerShouldUpdateLifecycle(actualLanguage, actualHMILanguage);
+
             ChangeRegistration changeRegistration;
-            if (lcuNew == null) {
-                lcu = lcuOld;
-                changeRegistration = new ChangeRegistration(actualLanguage, actualLanguage);
-            } else {
-                lcu = lcuNew;
-                changeRegistration = new ChangeRegistration(actualLanguage, actualHMILanguage);
-            }
+            changeRegistration = new ChangeRegistration(actualLanguage, actualHMILanguage);
 
             if (lcu != null) {
                 changeRegistration.setAppName(lcu.getAppName());
@@ -787,17 +780,6 @@ abstract class BaseSdlManager {
         }
 
         /**
-         * Sets the Security libraries
-         *
-         * @param secList The list of security class(es)
-         */
-        @Deprecated
-        public Builder setSdlSecurity(List<Class<? extends SdlSecurityBase>> secList) {
-            sdlManager.sdlSecList = secList;
-            return this;
-        }
-
-        /**
          * Sets the security libraries and a callback to notify caller when there is update to encryption service
          *
          * @param secList  The list of security class(es)
diff --git a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
index 6056cdbf6..87cb05eb4 100644
--- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
@@ -86,14 +86,6 @@ abstract class BaseFileManager extends BaseSubManager {
 	private FileManagerConfig fileManagerConfig;
 	private HashMap<String, Integer> failedFileUploadsIndex;
 
-	@Deprecated
-	BaseFileManager(ISdl internalInterface) {
-
-		// setup
-		super(internalInterface);
-		uploadedEphemeralFileNames = new ArrayList<>();
-	}
-
 	/**
 	 * Constructor for BaseFileManager
 	 * @param internalInterface ISDL
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
index a366d5984..d780ef244 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -1028,7 +1028,7 @@ abstract class BaseLifecycleManager {
         @Override
         public Object getCapability(SystemCapabilityType systemCapabilityType) {
             if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType);
+                return BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, null, false);
             } else {
                 return null;
             }
@@ -1037,7 +1037,7 @@ abstract class BaseLifecycleManager {
         @Override
         public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) {
             if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, scListener);
+                BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, scListener, false);
             }
         }
 
@@ -1188,11 +1188,6 @@ abstract class BaseLifecycleManager {
         }
     }
 
-    @Deprecated
-    public void setSdlSecurityClassList(List<Class<? extends SdlSecurityBase>> list) {
-        _secList = list;
-    }
-
     /**
      * Sets the security libraries and a callback to notify caller when there is update to encryption service
      *
diff --git a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
index ede4d7fbe..d53dfe9bd 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseSystemCapabilityManager.java
@@ -167,7 +167,7 @@ abstract class BaseSystemCapabilityManager {
 
 	private void updateDeprecatedDisplayCapabilities() {
 		WindowCapability defaultMainWindowCapabilities = getDefaultMainWindowCapability();
-		List<DisplayCapability> displayCapabilityList = convertToList(getCapability(SystemCapabilityType.DISPLAYS), DisplayCapability.class);
+		List<DisplayCapability> displayCapabilityList = convertToList(getCapability(SystemCapabilityType.DISPLAYS, null, false), DisplayCapability.class);
 
 		if (defaultMainWindowCapabilities == null || displayCapabilityList == null || displayCapabilityList.size() == 0) {
 			return;
@@ -185,7 +185,7 @@ abstract class BaseSystemCapabilityManager {
 			return;
 		}
 
-		List<DisplayCapability> oldCapabilities = convertToList(getCapability(SystemCapabilityType.DISPLAYS), DisplayCapability.class);
+		List<DisplayCapability> oldCapabilities = convertToList(getCapability(SystemCapabilityType.DISPLAYS, null, false), DisplayCapability.class);
 
 		if (oldCapabilities == null || oldCapabilities.size() == 0) {
 			setCapability(SystemCapabilityType.DISPLAYS, newCapabilities);
@@ -228,7 +228,7 @@ abstract class BaseSystemCapabilityManager {
 
 
 	public WindowCapability getWindowCapability(int windowID) {
-		List<DisplayCapability> capabilities = convertToList(getCapability(SystemCapabilityType.DISPLAYS), DisplayCapability.class);
+		List<DisplayCapability> capabilities = convertToList(getCapability(SystemCapabilityType.DISPLAYS, null, false), DisplayCapability.class);
 		if (capabilities == null || capabilities.size() == 0) {
 			return null;
 		}
@@ -405,7 +405,7 @@ abstract class BaseSystemCapabilityManager {
 							if (rpcVersion.isBetween(new Version(3, 0, 0), new Version(4, 4, 0)) >= 0) {
 								//This was before the system capability feature was added so check if
 								// graphics are supported instead
-								DisplayCapabilities displayCapabilities = (DisplayCapabilities) getCapability(SystemCapabilityType.DISPLAY);
+								DisplayCapabilities displayCapabilities = (DisplayCapabilities) getCapability(SystemCapabilityType.DISPLAY, null, false);
 								if (displayCapabilities != null) {
 									return displayCapabilities.getGraphicSupported() != null && displayCapabilities.getGraphicSupported();
 								}
@@ -498,26 +498,6 @@ abstract class BaseSystemCapabilityManager {
 		return getCapabilityPrivate(systemCapabilityType, scListener, null, forceUpdate);
 	}
 
-	/** Gets the capability object that corresponds to the supplied capability type by calling the listener immediately with the cached value, if available. If not available, the listener will retrieve a new value and return that when the head unit responds.
-	 * @param systemCapabilityType Type of capability desired
-	 * @param scListener callback to execute upon retrieving capability
-	 * @deprecated use {@link #getCapability(SystemCapabilityType, OnSystemCapabilityListener, boolean)} instead.
-	 */
-	@Deprecated
-	public void getCapability(final SystemCapabilityType systemCapabilityType, final OnSystemCapabilityListener scListener) {
-		getCapabilityPrivate(systemCapabilityType, scListener, null, false);
-	}
-
-	/** Gets the capability object that corresponds to the supplied capability type by returning the currently cached value immediately if available. Otherwise returns a null object and works in the background to retrieve the capability for the next call
-	 * @param systemCapabilityType Type of capability desired
-	 * @return Desired capability if it is cached in the manager, otherwise returns null
-	 * @deprecated use {@link #getCapability(SystemCapabilityType, OnSystemCapabilityListener, boolean)} instead.
-	 */
-	@Deprecated
-	public Object getCapability(final SystemCapabilityType systemCapabilityType) {
-		return getCapabilityPrivate(systemCapabilityType, null, null, false);
-	}
-
 	/**
 	 * Adds a listener to be called whenever a new capability is retrieved. This method automatically subscribes to the supplied capability type and may call the listener multiple times if there are future updates, unlike getCapability() methods, which only call the listener one time.
 	 * @param systemCapabilityType Type of capability desired
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/KeyboardAutocompleteCompletionListener.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/KeyboardAutocompleteCompletionListener.java
index 13b19238d..9178e6c74 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/KeyboardAutocompleteCompletionListener.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/KeyboardAutocompleteCompletionListener.java
@@ -37,14 +37,6 @@ import java.util.List;
 public interface KeyboardAutocompleteCompletionListener {
 
 	/**
-	 * This listener is called when you wish to update your autocomplete text in response to the user's input
-	 * @param updatedAutoCompleteText - The new autocomplete text to use
-	 * @deprecated use {@link #onUpdatedAutoCompleteList(List<String>)} instead
-	 */
-	@Deprecated
-	void onUpdatedAutoCompleteText(String updatedAutoCompleteText);
-
-	/**
 	 * This listener is called when you wish to update your autocomplete suggestions list in response to the user's input
 	 * @param updatedAutoCompleteList - The new autocomplete suggestions list to use
 	 */
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java
index 121b1f6c0..c0e206eed 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentChoiceSetOperation.java
@@ -341,15 +341,8 @@ class PresentChoiceSetOperation extends Task {
 					// Notify of Keypress
 					keyboardListener.updateAutocompleteWithInput(onKeyboard.getData(), new KeyboardAutocompleteCompletionListener() {
 						@Override
-						public void onUpdatedAutoCompleteText(String updatedAutoCompleteText) {
-							keyboardProperties.setAutoCompleteText(updatedAutoCompleteText);
-							updateKeyboardProperties(null);
-						}
-
-						@Override
 						public void onUpdatedAutoCompleteList(List<String> updatedAutoCompleteList) {
 							keyboardProperties.setAutoCompleteList(updatedAutoCompleteList != null ? updatedAutoCompleteList : new ArrayList<String>());
-							keyboardProperties.setAutoCompleteText(updatedAutoCompleteList != null && !updatedAutoCompleteList.isEmpty() ? updatedAutoCompleteList.get(0) : null);
 							updateKeyboardProperties(null);
 						}
 					});
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java
index 33db35607..b48bbffd2 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PresentKeyboardOperation.java
@@ -286,12 +286,6 @@ class PresentKeyboardOperation extends Task {
 					// Notify of Keypress
 					keyboardListener.updateAutocompleteWithInput(onKeyboard.getData(), new KeyboardAutocompleteCompletionListener() {
 						@Override
-						public void onUpdatedAutoCompleteText(String updatedAutoCompleteText) {
-							keyboardProperties.setAutoCompleteText(updatedAutoCompleteText);
-							updateKeyboardProperties(null);
-						}
-
-						@Override
 						public void onUpdatedAutoCompleteList(List<String> updatedAutoCompleteList) {
 							keyboardProperties.setAutoCompleteList(updatedAutoCompleteList != null ? updatedAutoCompleteList : new ArrayList<String>());
 							keyboardProperties.setAutoCompleteText(updatedAutoCompleteList != null && !updatedAutoCompleteList.isEmpty() ? updatedAutoCompleteList.get(0) : null);
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java
index 20cc44d38..4eef7777f 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuCell.java
@@ -116,24 +116,6 @@ public class MenuCell implements Cloneable{
 	 * Creates a new MenuCell Object with multiple parameters set
 	 * <strong>NOTE: because this has sub-cells, there does not need to be a listener</strong>
 	 * @param title The cell's primary text
-	 * @param icon The cell's image
-	 * @param subCells The sub-cells for the sub menu that will appear when the cell is selected
-	 *
-	 * @deprecated use {@link #MenuCell(String, MenuLayout, SdlArtwork, List)}
-	 */
-	@Deprecated
-	public MenuCell(@NonNull String title, @Nullable SdlArtwork icon, @Nullable List<MenuCell> subCells) {
-		setTitle(title); // title is the only required param
-		setIcon(icon);
-		setSubCells(subCells);
-		setCellId(MAX_ID);
-		setParentCellId(MAX_ID);
-	}
-
-	/**
-	 * Creates a new MenuCell Object with multiple parameters set
-	 * <strong>NOTE: because this has sub-cells, there does not need to be a listener</strong>
-	 * @param title The cell's primary text
 	 * @param subMenuLayout The submenu's layout that the subCells will be shown in. If `null`, the
 	 *                      default submenu layout in the screen manager's `MenuConfiguration` will be used.
 	 * @param icon The cell's image
diff --git a/base/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java b/base/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java
deleted file mode 100644
index 37e7972f4..000000000
--- a/base/src/main/java/com/smartdevicelink/protocol/IProtocolListener.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*

- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- * Redistributions of source code must retain the above copyright notice, this

- * list of conditions and the following disclaimer.

- *

- * Redistributions in binary form must reproduce the above copyright notice,

- * this list of conditions and the following

- * disclaimer in the documentation and/or other materials provided with the

- * distribution.

- *

- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

- * software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-package com.smartdevicelink.protocol;

-

-

-import com.smartdevicelink.protocol.enums.SessionType;

-

-import java.util.List;

-

-@Deprecated

-public interface IProtocolListener {

-	// Called to indicate that these bytes are to be sent as part of a message.

-	// This call includes the part of the message.

-	void onProtocolMessageBytesToSend(SdlPacket packet);

-

-	// Called to indicate that a complete message (RPC, BULK, etc.) has been

-	// received.  This call includes the message.

-	void onProtocolMessageReceived(ProtocolMessage msg);

-

-	// Called to indicate that a protocol session has been started (from either side)

-	void onProtocolSessionStarted(SessionType sessionType, byte sessionID, byte version, String correlationID, int hashID, boolean isEncrypted);

-	

-	void onProtocolSessionNACKed(SessionType sessionType, byte sessionID, byte version,

-	                             String correlationID, List<String> rejectedParams);

-

-	// Called to indicate that a protocol session has ended (from either side)

-	void onProtocolSessionEnded(SessionType sessionType, byte sessionID, String correlationID /*, String info, Exception ex*/);

- 	

-	void onProtocolSessionEndedNACKed(SessionType sessionType, byte sessionID, String correlationID /*, String info, Exception ex*/);

-

-	void onProtocolHeartbeat(SessionType sessionType, byte sessionID);

-	

-	/**

-     * Called when a protocol heartbeat ACK message has been received from SDL.

-     */

-    void onProtocolHeartbeatACK(SessionType sessionType, byte sessionID);

-    

-    void onProtocolServiceDataACK(SessionType sessionType, int dataSize, byte sessionID);

-

-    void onResetOutgoingHeartbeat(SessionType sessionType, byte sessionID);

-

-    void onResetIncomingHeartbeat(SessionType sessionType, byte sessionID);

-

-	// Called to indicate that a protocol error was detected in received data.

-	void onProtocolError(String info, Exception e);

-

-} // end-interfCe

diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java
index 616f07f42..c39e6bee2 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IAudioStreamListener.java
@@ -68,20 +68,6 @@ public interface IAudioStreamListener {
 	 *                           last audio sample data included in this chunk, in microseconds.
 	 *                           It must be greater than the previous timestamp.
 	 *                           Specify -1 if unknown.
-	 */
-	@Deprecated
-	void sendAudio(ByteBuffer data, long presentationTimeUs);
-
-	/**
-	 * Sends a chunk of audio data to SDL Core.
-	 * <p>
-	 * Note: this method must not be called after SdlProxyBase.endAudioStream() is called.
-	 *
-	 * @param data               Data chunk to send. Its position will be updated upon return.
-	 * @param presentationTimeUs (Reserved for future use) Presentation timestamp (PTS) of the
-	 *                           last audio sample data included in this chunk, in microseconds.
-	 *                           It must be greater than the previous timestamp.
-	 *                           Specify -1 if unknown.
 	 * @param completionListener A completion listener that informs when the audio file is played
 	 */
 	void sendAudio(ByteBuffer data, long presentationTimeUs, CompletionListener completionListener);
diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java
deleted file mode 100644
index b0c557b8e..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/IPutFileResponseListener.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.interfaces;
-
-import com.smartdevicelink.proxy.rpc.PutFileResponse;
-
-@Deprecated
-public interface IPutFileResponseListener {
-	public void onPutFileResponse(PutFileResponse response);
-	
-	public void onPutFileStreamError(Exception e, String info);
-}
diff --git a/base/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java b/base/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java
index 0cfdb4c76..c51652c3b 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/AbstractPacketizer.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.streaming;

 

 import com.smartdevicelink.SdlConnection.SdlSession;

@@ -49,13 +49,9 @@ abstract public class AbstractPacketizer {
 	protected InputStream is = null;

 	protected int bufferSize;

 	protected byte[] buffer;

-	protected boolean upts = false;

 	protected RPCRequest _request = null;

 	protected Version _wiproVersion = new Version("1.0.0");

 

-	//protected long ts = 0, intervalBetweenReports = 5000, delta = 0;

-	protected long intervalBetweenReports = 5000, delta = 0;

-

 	public AbstractPacketizer(IStreamListener streamListener, InputStream is, SessionType sType, byte rpcSessionID, SdlSession session) throws IOException, IllegalArgumentException {

 		this._streamListener = streamListener;

 		this.is = is;

@@ -70,23 +66,6 @@ abstract public class AbstractPacketizer {
 		}

 	}

 

-	@Deprecated

-	public AbstractPacketizer(IStreamListener streamListener, InputStream is, RPCRequest request, SessionType sType, byte rpcSessionID, byte wiproVersion, SdlSession session) throws IOException, IllegalArgumentException {

-		this._streamListener = streamListener;

-		this.is = is;

-		_rpcSessionID = rpcSessionID;

-		_serviceType = sType;

-		_request = request;

-		_wiproVersion = new Version(wiproVersion+".0.0");

-		this._session = session;

-		if (this._session != null) {

-			bufferSize = this._session.getMtu();

-			buffer = new byte[bufferSize];

-		}else{

-			throw new IllegalArgumentException("Session variable is null");

-		}

-	}

-

 	public AbstractPacketizer(IStreamListener streamListener, InputStream is, RPCRequest request, SessionType sType, byte rpcSessionID, Version protocolVersion, SdlSession session) throws IOException, IllegalArgumentException {

 		this._streamListener = streamListener;

 		this.is = is;

diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
index d66b75ed4..372e2548c 100644
--- a/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
+++ b/base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
@@ -172,44 +172,6 @@ public class VideoStreamingParameters {
 
     }
 
-    /**
-     * Update the values contained in the capability that should have been returned through the SystemCapabilityManager.
-     * This update will use the most preferred streaming format from the module.
-     * @param capability the video streaming capability returned from the SystemCapabilityManager
-     * @see com.smartdevicelink.proxy.SystemCapabilityManager
-     * @see VideoStreamingCapability
-     */
-    @Deprecated
-    public void update(VideoStreamingCapability capability){
-        if(capability.getMaxBitrate()!=null){ this.bitrate = capability.getMaxBitrate() * 1000; } // NOTE: the unit of maxBitrate in getSystemCapability is kbps.
-        double scale = DEFAULT_SCALE;
-        if(capability.getScale() != null) { scale = capability.getScale(); }
-        ImageResolution resolution = capability.getPreferredResolution();
-        if(resolution!=null){
-
-            if(resolution.getResolutionHeight()!=null && resolution.getResolutionHeight() > 0){ this.resolution.setResolutionHeight((int)(resolution.getResolutionHeight() / scale)); }
-            if(resolution.getResolutionWidth()!=null && resolution.getResolutionWidth() > 0){ this.resolution.setResolutionWidth((int)(resolution.getResolutionWidth() / scale)); }
-        }
-
-        // This should be the last call as it will return out once a suitable format is found
-        final List<VideoStreamingFormat> formats = capability.getSupportedFormats();
-        if(formats != null && formats.size()>0){
-            for(VideoStreamingFormat format : formats){
-                for(int i = 0; i < CURRENTLY_SUPPORTED_FORMATS.length; i ++){
-                    if(CURRENTLY_SUPPORTED_FORMATS[i].equals(format) ){
-                        this.format = format;
-                        return;
-                    }
-                }
-            }
-            DebugTool.logWarning(TAG, "The VideoStreamingFormat has not been updated because none of the provided formats are supported.");
-
-            //TODO In the future we should set format to null, but might be a breaking change
-            // For now, format will remain whatever was set prior to this update
-        }
-
-    }
-
     @SuppressWarnings("unused")
     public void setDisplayDensity(int displayDensity) {
         this.displayDensity = displayDensity;
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)