Remove Deprecated Isdl methods (#1485)

* Remove deprecated video streaming apis from isdl

* Fix unit tests

* Remove deprecated RPC sending methods from Isdl

* Remove deprecated rpc sending usages from managers

* Fix unit tests

* Remove deprecated SCM methods from Isdl

* Update SCM Isdl calls in VideoStreamManager

* Update SCM Isdl calls in AudioStreamManager

* Update SCM Isdl calls in ScreenManager

* Update SystemCapabilityManagerTests

* Fix TextAndGraphicManagerTests

* Fix SoftButtonManagerTests

* Fix SoftButtonManagerTests

* Fix AudioStreamManager tests

* Update gitignore

20 files changed, 181 insertions, 328 deletions

diff --git a/.gitignore b/.gitignore
index 28594f757..e9408b57d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,6 @@ javaSE/javaSE/local.properties
 javaEE/javaEE/out/
 javaEE/javaEE/build/
 javaEE/javaEE/local.properties
-baseAndroid/windows/
-
 
 ##############################
 # OS generated files 
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 c5837c2cb..1d5d12059 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
@@ -12,6 +12,8 @@ import androidx.test.platform.app.InstrumentationRegistry;
 import com.smartdevicelink.SdlConnection.SdlSession;

 import com.smartdevicelink.managers.CompletionListener;

 import com.smartdevicelink.managers.audio.AudioStreamManager.SampleType;

+import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;

+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;

 import com.smartdevicelink.protocol.enums.SessionType;

 import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;

 import com.smartdevicelink.proxy.interfaces.ISdl;

@@ -39,7 +41,9 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

 

 import static org.mockito.ArgumentMatchers.any;

+import static org.mockito.ArgumentMatchers.anyBoolean;

 import static org.mockito.ArgumentMatchers.eq;

+import static org.mockito.ArgumentMatchers.isNull;

 import static org.mockito.Mockito.doAnswer;

 import static org.mockito.Mockito.doReturn;

 import static org.mockito.Mockito.mock;

@@ -65,9 +69,11 @@ public class AudioStreamManagerTest extends TestCase {
 

     public void testCreatingAudioStreamManager() {

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         AudioPassThruCapabilities audioCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(SystemCapabilityType.PCM_STREAMING);

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.PCM_STREAMING), (OnSystemCapabilityListener) isNull(), anyBoolean());

 

         new AudioStreamManager(internalInterface, mContext);

     }

@@ -101,9 +107,11 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         AudioPassThruCapabilities audioCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(SystemCapabilityType.PCM_STREAMING);

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.PCM_STREAMING), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -289,8 +297,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -517,8 +527,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

@@ -594,8 +606,10 @@ public class AudioStreamManagerTest extends TestCase {
         };

 

         ISdl internalInterface = mock(ISdl.class);

+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);

+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();

         doReturn(true).when(internalInterface).isConnected();

-        doReturn(audioCapabilities).when(internalInterface).getCapability(any(SystemCapabilityType.class));

+        doReturn(audioCapabilities).when(systemCapabilityManager).getCapability(any(SystemCapabilityType.class), (OnSystemCapabilityListener) isNull(), anyBoolean());

         doAnswer(audioServiceAnswer).when(internalInterface).addServiceListener(any(SessionType.class), any(ISdlServiceListener.class));

         doAnswer(audioServiceAnswer).when(internalInterface).startAudioService(any(Boolean.class));

 

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
index 8908346d2..34cc6bf2a 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/file/FileManagerTests.java
@@ -248,7 +248,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListDeleteRequestSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final List<String> fileNames = new ArrayList<>();
 		fileNames.add("Julian");
@@ -280,7 +280,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListDeleteRequestFail).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListDeleteRequestFail).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final List<String> fileNames = new ArrayList<>();
 		fileNames.add("Julian");
@@ -403,7 +403,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onSendRequestsFailOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -434,7 +434,7 @@ public class FileManagerTests {
 
 			}
 		});
-		verify(internalInterface, times(5)).sendRequests(any(List.class),any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(5)).sendRPCs(any(List.class),any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -552,7 +552,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -573,7 +573,7 @@ public class FileManagerTests {
 				});
 			}
 		});
-		verify(internalInterface, times(0)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(0)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -584,7 +584,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -606,7 +606,7 @@ public class FileManagerTests {
 				});
 			}
 		});
-		verify(internalInterface, times(1)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
@@ -702,7 +702,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 
@@ -739,7 +739,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onSendRequestsFailPartialOnError).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -788,7 +788,7 @@ public class FileManagerTests {
 		ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		FileManagerConfig fileManagerConfig = new FileManagerConfig();
 		final FileManager fileManager = new FileManager(internalInterface, mTestContext, fileManagerConfig);
@@ -908,7 +908,7 @@ public class FileManagerTests {
 		final ISdl internalInterface = mock(ISdl.class);
 
 		doAnswer(onListFilesSuccess).when(internalInterface).sendRPC(any(ListFiles.class));
-		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		doAnswer(onListFileUploadSuccess).when(internalInterface).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 
 		final SdlFile validFile2 = new SdlFile();
 		validFile2.setName(TestValues.GENERAL_STRING + "2");
@@ -944,7 +944,7 @@ public class FileManagerTests {
 
 			}
 		});
-		verify(internalInterface, times(1)).sendRequests(any(List.class), any(OnMultipleRequestListener.class));
+		verify(internalInterface, times(1)).sendRPCs(any(List.class), any(OnMultipleRequestListener.class));
 	}
 
 	/**
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 109bf6316..a14e98383 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
@@ -960,17 +960,9 @@ public class SystemCapabilityManagerTests {
 		public void startVideoService(VideoStreamingParameters parameters, boolean encrypted) {	}
 
 		@Override
-		public void sendRPCRequest(RPCRequest message) {}
-
-		@Override
 		public void sendRPC(RPCMessage message) {}
 
 		@Override
-		public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
-
-		}
-
-		@Override
 		public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
 
 		}
@@ -1021,12 +1013,6 @@ public class SystemCapabilityManagerTests {
 			return false;
 		}
 
-		@Override
-		public Object getCapability(SystemCapabilityType systemCapabilityType){return null;}
-
-		@Override
-		public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) {
-		}
 
 		@Override
 		public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
@@ -1034,11 +1020,6 @@ public class SystemCapabilityManagerTests {
 		}
 
 		@Override
-		public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
-			return null;
-		}
-
-		@Override
 		public SdlMsgVersion getSdlMsgVersion() {
 			return null;
 		}
@@ -1048,46 +1029,24 @@ public class SystemCapabilityManagerTests {
 			return new Version(1,0,0);
 		}
 
-
-		@Override
-		public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType){
-			return false;
-		}
-
-		@Override
-		public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { }
-
-		@Override
-		public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) { return false; }
-
 		@Override
 		public boolean isTransportForServiceAvailable(SessionType serviceType) {
 			return false;
 		}
 
 		@Override
-		public void startAudioService(boolean isEncrypted, AudioStreamingCodec codec,
-									  AudioStreamingParams params) {}
+		public void startAudioService(boolean encrypted){}
 
 		@Override
-		public IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters){
-			return null;
-		}
+		public void startRPCEncryption() {}
 
 		@Override
-		public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec,
-													 AudioStreamingParams params) {
+		public Taskmaster getTaskmaster() {
 			return null;
 		}
 
 		@Override
-		public void startAudioService(boolean encrypted){}
-
-		@Override
-		public void startRPCEncryption() {}
-
-		@Override
-		public Taskmaster getTaskmaster() {
+		public SystemCapabilityManager getSystemCapabilityManager() {
 			return null;
 		}
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
index e5daf375b..b43be2af6 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java
@@ -3,12 +3,12 @@ package com.smartdevicelink.managers.screen;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
-import com.smartdevicelink.managers.CompletionListener;
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.MultipleFileCompletionListener;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
@@ -51,6 +51,7 @@ import static org.junit.Assert.assertNotEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -89,7 +90,7 @@ public class SoftButtonManagerTests {
         doAnswer(onHMIStatusAnswer).when(internalInterface).addOnRPCNotificationListener(eq(FunctionID.ON_HMI_STATUS), any(OnRPCNotificationListener.class));
 
 
-        // When internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener) is called
+        // When internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onSystemCapabilityListener) is called
         // inside SoftButtonManager, respond with a fake response to let the SoftButtonManager continue working.
         Answer<Void> onSystemCapabilityAnswer = new Answer<Void>() {
             @Override
@@ -108,8 +109,9 @@ public class SoftButtonManagerTests {
                 return null;
             }
         };
-        doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
-
+        SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+        doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+        doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
 
         // When fileManager.uploadArtworks() is called inside the SoftButtonManager, respond with
         // a fake onComplete() callback to let the SoftButtonManager continue working.
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
index 2bb0164fb..e5deb7f30 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/TextAndGraphicManagerTests.java
@@ -11,6 +11,7 @@ import com.smartdevicelink.managers.ManagerUtility;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.rpc.DisplayCapability;
@@ -43,6 +44,7 @@ import static junit.framework.TestCase.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -102,7 +104,9 @@ public class TextAndGraphicManagerTests {
 				return null;
 			}
 		};
-		doAnswer(onSystemCapabilityAnswer).when(internalInterface).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doAnswer(onSystemCapabilityAnswer).when(systemCapabilityManager).addOnSystemCapabilityListener(eq(SystemCapabilityType.DISPLAYS), any(OnSystemCapabilityListener.class));
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
 
 		textAndGraphicManager = new TextAndGraphicManager(internalInterface, fileManager, softButtonManager);
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
index a393bf34f..2a09311e9 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/video/VideoStreamManagerTests.java
@@ -2,20 +2,21 @@ package com.smartdevicelink.managers.video;
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 import com.smartdevicelink.managers.CompletionListener;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.interfaces.ISdlServiceListener;
-import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
 import com.smartdevicelink.proxy.rpc.ImageResolution;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.OnTouchEvent;
@@ -39,13 +40,13 @@ import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertFalse;
 import static junit.framework.TestCase.assertNotNull;
@@ -54,11 +55,11 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 /**
  * This is a unit test class for the SmartDeviceLink video streaming manager class :
@@ -139,6 +140,9 @@ public class VideoStreamManagerTests {
 	public void testHMILevelNotFull(){
 		final ISdl internalInterface = mock(ISdl.class);
 
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+
 		when(internalInterface.getProtocolVersion()).thenReturn((new Version(5,0,0)));
 
 		RegisterAppInterfaceResponse mockRegisterAppInterfaceResponse = new RegisterAppInterfaceResponse();
@@ -147,7 +151,7 @@ public class VideoStreamManagerTests {
 		mockRegisterAppInterfaceResponse.setVehicleType(mockVehicleType);
 		when(internalInterface.getRegisterAppInterfaceResponse()).thenReturn(mockRegisterAppInterfaceResponse);
 
-		when(internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
+		when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
 
 		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
 		videoStreamManager.start(new CompletionListener() {
@@ -174,7 +178,10 @@ public class VideoStreamManagerTests {
 		final Set<Object> listenerSet = new HashSet<>();
 
 		when(internalInterface.getProtocolVersion()).thenReturn(new Version(5,0,0));
-		when(internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
+
+		SystemCapabilityManager systemCapabilityManager = mock(SystemCapabilityManager.class);
+		doReturn(systemCapabilityManager).when(internalInterface).getSystemCapabilityManager();
+		when(systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(true);
 
 		Answer<Void> onGetCapability = new Answer<Void>() {
 			@Override
@@ -186,7 +193,7 @@ public class VideoStreamManagerTests {
 			}
 		};
 
-		doAnswer(onGetCapability).when(internalInterface).getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class));
+		doAnswer(onGetCapability).when(systemCapabilityManager).getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean());
 
 		Answer<Void> onAddServiceListener = new Answer<Void>() {
 			@Override
@@ -247,14 +254,7 @@ public class VideoStreamManagerTests {
 
 		doAnswer(onRemoveServiceListener).when(internalInterface).removeServiceListener(eq(SessionType.NAV), any(ISdlServiceListener.class));
 
-		when(internalInterface.startVideoStream(anyBoolean(), any(VideoStreamingParameters.class))).thenReturn(new IVideoStreamListener() {
-			@Override
-			public void sendFrame(byte[] data, int offset, int length, long presentationTimeUs) throws ArrayIndexOutOfBoundsException {}
-			@Override
-			public void sendFrame(ByteBuffer data, long presentationTimeUs) {}
-		});
-
-		when(internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING)).thenReturn(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
+		when(systemCapabilityManager.getCapability(eq(SystemCapabilityType.VIDEO_STREAMING), any(OnSystemCapabilityListener.class), anyBoolean())).thenReturn(TestValues.GENERAL_VIDEOSTREAMINGCAPABILITY);
 
 		final VideoStreamManager videoStreamManager = new VideoStreamManager(internalInterface);
 		videoStreamManager.start(new CompletionListener() {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
index 21d5bfe22..52b4db580 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/audio/AudioStreamManager.java
@@ -220,22 +220,24 @@ public class AudioStreamManager extends BaseAudioStreamManager {
     }

 

     private void getAudioStreamingCapabilities(){

-        internalInterface.getCapability(SystemCapabilityType.PCM_STREAMING, new OnSystemCapabilityListener() {

-            @Override

-            public void onCapabilityRetrieved(Object capability) {

-                if(capability != null && capability instanceof AudioPassThruCapabilities){

-                    audioStreamingCapabilities = (AudioPassThruCapabilities) capability;

-                    checkState();

+        if (internalInterface.getSystemCapabilityManager() != null) {

+            internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.PCM_STREAMING, new OnSystemCapabilityListener() {

+                @Override

+                public void onCapabilityRetrieved(Object capability) {

+                    if (capability != null && capability instanceof AudioPassThruCapabilities) {

+                        audioStreamingCapabilities = (AudioPassThruCapabilities) capability;

+                        checkState();

+                    }

                 }

-            }

 

-            @Override

-            public void onError(String info) {

-                DebugTool.logError(TAG, "Error retrieving audio streaming capability: " + info);

-                streamingStateMachine.transitionToState(StreamingStateMachine.ERROR);

-                transitionToState(ERROR);

-            }

-        });

+                @Override

+                public void onError(String info) {

+                    DebugTool.logError(TAG, "Error retrieving audio streaming capability: " + info);

+                    streamingStateMachine.transitionToState(StreamingStateMachine.ERROR);

+                    transitionToState(ERROR);

+                }

+            }, false);

+        }

     }

 

     @Override

@@ -271,7 +273,10 @@ public class AudioStreamManager extends BaseAudioStreamManager {
             return;

         }

 

-        AudioPassThruCapabilities capabilities = (AudioPassThruCapabilities) internalInterface.getCapability(SystemCapabilityType.PCM_STREAMING);

+        AudioPassThruCapabilities capabilities = null;

+        if (internalInterface.getSystemCapabilityManager() != null) {

+            capabilities = (AudioPassThruCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.PCM_STREAMING, null, false);

+        }

 

         if (capabilities != null) {

             switch (capabilities.getSamplingRate()) {

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
index f1b9fd4f3..78b6bb03b 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/HapticInterfaceManager.java
@@ -65,7 +65,7 @@ class HapticInterfaceManager extends BaseHapticInterfaceManager {
             ISdl proxy = proxyHolder.get();
             SendHapticData msg = new SendHapticData();
             msg.setHapticRectData(userHapticData);
-            proxy.sendRPCRequest(msg);
+            proxy.sendRPC(msg);
         }
     }
 
@@ -99,8 +99,10 @@ class HapticInterfaceManager extends BaseHapticInterfaceManager {
 
         if (proxyHolder.get() != null) {
             ISdl proxy = proxyHolder.get();
-            VideoStreamingCapability videoStreamingCapability = (VideoStreamingCapability)
-                    proxy.getCapability(SystemCapabilityType.VIDEO_STREAMING);
+            VideoStreamingCapability videoStreamingCapability = null;
+            if (proxy.getSystemCapabilityManager() != null) {
+                videoStreamingCapability = (VideoStreamingCapability) proxy.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
+            }
             if (videoStreamingCapability != null && videoStreamingCapability.getScale() != null) {
                 scale = videoStreamingCapability.getScale();
             }
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
index 9858bb023..77467f429 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java
@@ -123,7 +123,10 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 					stateMachine.transitionToState(StreamingStateMachine.ERROR);
 					return;
 				}
-				VideoStreamingCapability capability = (VideoStreamingCapability) internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING);
+				VideoStreamingCapability capability = null;
+				if (internalInterface.getSystemCapabilityManager() != null) {
+					capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
+				}
 				if(capability != null && Boolean.TRUE.equals(capability.getIsHapticSpatialDataSupported())){
 					hapticManager = new HapticInterfaceManager(internalInterface);
 				}
@@ -235,28 +238,33 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 
 	private void getVideoStreamingParams(){
 		if(internalInterface.getProtocolVersion().getMajor() >= 5) {
-			internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
-				@Override
-				public void onCapabilityRetrieved(Object capability) {
-					VideoStreamingParameters params = new VideoStreamingParameters();
-					params.update((VideoStreamingCapability)capability, vehicleMake);	//Streaming parameters are ready time to stream
-					VideoStreamManager.this.parameters = params;
+			if (internalInterface.getSystemCapabilityManager() != null) {
+				internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
+					@Override
+					public void onCapabilityRetrieved(Object capability) {
+						VideoStreamingParameters params = new VideoStreamingParameters();
+						params.update((VideoStreamingCapability) capability, vehicleMake);    //Streaming parameters are ready time to stream
+						VideoStreamManager.this.parameters = params;
 
-					checkState();
+						checkState();
 
-				}
+					}
 
-				@Override
-				public void onError(String info) {
-					DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
-					stateMachine.transitionToState(StreamingStateMachine.ERROR);
-					transitionToState(ERROR);
-				}
-			});
+					@Override
+					public void onError(String info) {
+						DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
+						stateMachine.transitionToState(StreamingStateMachine.ERROR);
+						transitionToState(ERROR);
+					}
+				}, false);
+			}
 		}else{
 			//We just use default video streaming params
 			VideoStreamingParameters params = new VideoStreamingParameters();
-			DisplayCapabilities dispCap = (DisplayCapabilities)internalInterface.getCapability(SystemCapabilityType.DISPLAY);
+			DisplayCapabilities dispCap = null;
+			if (internalInterface.getSystemCapabilityManager() != null) {
+				dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+			}
 			if(dispCap !=null){
 				params.setResolution(dispCap.getScreenParams().getImageResolution());
 			}
@@ -280,31 +288,37 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 		this.context = new WeakReference<>(context);
 		this.remoteDisplayClass = remoteDisplayClass;
 		int majorProtocolVersion = internalInterface.getProtocolVersion().getMajor();
-		if(majorProtocolVersion >= 5 && !internalInterface.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)){
+		boolean isCapabilitySupported = internalInterface.getSystemCapabilityManager() != null && internalInterface.getSystemCapabilityManager().isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING);
+		if(majorProtocolVersion >= 5 && !isCapabilitySupported){
 			DebugTool.logError(TAG, "Video streaming not supported on this module");
 			stateMachine.transitionToState(StreamingStateMachine.ERROR);
 			return;
 		}
 		if(parameters == null){
 			if(majorProtocolVersion >= 5) {
-				internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
-					@Override
-					public void onCapabilityRetrieved(Object capability) {
-						VideoStreamingParameters params = new VideoStreamingParameters();
-						params.update((VideoStreamingCapability)capability, vehicleMake);	//Streaming parameters are ready time to stream
-						startStreaming(params, encrypted);
-					}
+				if (internalInterface.getSystemCapabilityManager() != null) {
+					internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, new OnSystemCapabilityListener() {
+						@Override
+						public void onCapabilityRetrieved(Object capability) {
+							VideoStreamingParameters params = new VideoStreamingParameters();
+							params.update((VideoStreamingCapability) capability, vehicleMake);    //Streaming parameters are ready time to stream
+							startStreaming(params, encrypted);
+						}
 
-					@Override
-					public void onError(String info) {
-						stateMachine.transitionToState(StreamingStateMachine.ERROR);
-						DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
-					}
-				});
+						@Override
+						public void onError(String info) {
+							stateMachine.transitionToState(StreamingStateMachine.ERROR);
+							DebugTool.logError(TAG, "Error retrieving video streaming capability: " + info);
+						}
+					}, false);
+				}
 			}else{
 				//We just use default video streaming params
 				VideoStreamingParameters params = new VideoStreamingParameters();
-				DisplayCapabilities dispCap = (DisplayCapabilities)internalInterface.getCapability(SystemCapabilityType.DISPLAY);
+				DisplayCapabilities dispCap = null;
+				if (internalInterface.getSystemCapabilityManager() != null) {
+					dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+				}
 				if(dispCap !=null){
 					params.setResolution(dispCap.getScreenParams().getImageResolution());
 				}
@@ -469,14 +483,20 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 					//Get touch scalars
 					ImageResolution resolution = null;
 					if(internalInterface.getProtocolVersion().getMajor() >= 5){ //At this point we should already have the capability
-						VideoStreamingCapability capability = (VideoStreamingCapability) internalInterface.getCapability(SystemCapabilityType.VIDEO_STREAMING);
+						VideoStreamingCapability capability = null;
+						if (internalInterface.getSystemCapabilityManager() != null) {
+							capability = (VideoStreamingCapability) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.VIDEO_STREAMING, null, false);
+						}
 						if(capability != null){
 							resolution = capability.getPreferredResolution();
 						}
 					}
 
 					if(resolution == null){ //Either the protocol version is too low to access video streaming caps, or they were null
-						DisplayCapabilities dispCap = (DisplayCapabilities) internalInterface.getCapability(SystemCapabilityType.DISPLAY);
+						DisplayCapabilities dispCap = null;
+						if (internalInterface.getSystemCapabilityManager() != null) {
+							dispCap = (DisplayCapabilities) internalInterface.getSystemCapabilityManager().getCapability(SystemCapabilityType.DISPLAY, null, false);
+						}
 						if (dispCap != null) {
 							resolution = (dispCap.getScreenParams().getImageResolution());
 						}
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 e2a49a9d6..e1a5414a1 100644
--- a/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/file/BaseFileManager.java
@@ -301,7 +301,7 @@ abstract class BaseFileManager extends BaseSubManager {
 				}
 			}
 		};
-		internalInterface.sendRequests(requests, onMultipleRequestListener);
+		internalInterface.sendRPCs(requests, onMultipleRequestListener);
 	}
 
 	/**
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 d780ef244..c8566dbad 100644
--- a/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/lifecycle/BaseLifecycleManager.java
@@ -50,10 +50,8 @@ import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCNotification;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.RPCResponse;
-import com.smartdevicelink.proxy.interfaces.IAudioStreamListener;
 import com.smartdevicelink.proxy.interfaces.ISdl;
 import com.smartdevicelink.proxy.interfaces.ISdlServiceListener;
-import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
 import com.smartdevicelink.proxy.rpc.GenericResponse;
 import com.smartdevicelink.proxy.rpc.OnAppInterfaceUnregistered;
 import com.smartdevicelink.proxy.rpc.OnButtonEvent;
@@ -78,15 +76,12 @@ import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.RequestType;
 import com.smartdevicelink.proxy.rpc.enums.Result;
 import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
-import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCRequestListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;
 import com.smartdevicelink.security.SdlSecurityBase;
-import com.smartdevicelink.streaming.audio.AudioStreamingCodec;
-import com.smartdevicelink.streaming.audio.AudioStreamingParams;
 import com.smartdevicelink.streaming.video.VideoStreamingParameters;
 import com.smartdevicelink.transport.BaseTransportConfig;
 import com.smartdevicelink.util.CorrelationIdGenerator;
@@ -947,33 +942,11 @@ abstract class BaseLifecycleManager {
         }
 
         @Override
-        public IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters) {
-            DebugTool.logWarning(TAG, "startVideoStream is not currently implemented");
-            return null;
-        }
-
-        @Override
-        public void startAudioService(boolean encrypted, AudioStreamingCodec codec, AudioStreamingParams params) {
-            DebugTool.logWarning(TAG, "startAudioService is not currently implemented");
-        }
-
-        @Override
         public void startAudioService(boolean encrypted) {
             BaseLifecycleManager.this.startAudioService(encrypted);
         }
 
         @Override
-        public IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec, AudioStreamingParams params) {
-            DebugTool.logWarning(TAG, "startAudioStream is not currently implemented");
-            return null;
-        }
-
-        @Override
-        public void sendRPCRequest(RPCRequest message) {
-            BaseLifecycleManager.this.sendRPCMessagePrivate(message, false);
-        }
-
-        @Override
         public void sendRPC(RPCMessage message) {
             if (isConnected()) {
                 BaseLifecycleManager.this.sendRPCMessagePrivate(message, false);
@@ -981,11 +954,6 @@ abstract class BaseLifecycleManager {
         }
 
         @Override
-        public void sendRequests(List<? extends RPCRequest> rpcs, OnMultipleRequestListener listener) {
-            BaseLifecycleManager.this.sendRPCs(rpcs, listener);
-        }
-
-        @Override
         public void sendRPCs(List<? extends RPCMessage> rpcs, OnMultipleRequestListener listener) {
             BaseLifecycleManager.this.sendRPCs(rpcs, listener);
         }
@@ -1026,61 +994,11 @@ abstract class BaseLifecycleManager {
         }
 
         @Override
-        public Object getCapability(SystemCapabilityType systemCapabilityType) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, null, false);
-            } else {
-                return null;
-            }
-        }
-
-        @Override
-        public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, scListener, false);
-            }
-        }
-
-        @Override
-        public Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.getCapability(systemCapabilityType, scListener, forceUpdate);
-            } else {
-                return null;
-            }
-        }
-
-        @Override
         public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
             return raiResponse;
         }
 
         @Override
-        public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.isCapabilitySupported(systemCapabilityType);
-            } else {
-                return false;
-            }
-        }
-
-        @Override
-        public void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                BaseLifecycleManager.this.systemCapabilityManager.addOnSystemCapabilityListener(systemCapabilityType, listener);
-            }
-        }
-
-        @Override
-        public boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener) {
-            if (BaseLifecycleManager.this.systemCapabilityManager != null) {
-                return BaseLifecycleManager.this.systemCapabilityManager.removeOnSystemCapabilityListener(systemCapabilityType, listener);
-            } else {
-                return false;
-            }
-        }
-
-        @Override
         public boolean isTransportForServiceAvailable(SessionType serviceType) {
             return BaseLifecycleManager.this.session.isTransportForServiceAvailable(serviceType);
         }
@@ -1106,6 +1024,11 @@ abstract class BaseLifecycleManager {
         public Taskmaster getTaskmaster() {
             return BaseLifecycleManager.this.getTaskmaster();
         }
+
+        @Override
+        public SystemCapabilityManager getSystemCapabilityManager() {
+            return BaseLifecycleManager.this.systemCapabilityManager;
+        }
     };
 
     /* *******************************************************************************************************
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java
index 81df9f9f7..6694e0de3 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseSoftButtonManager.java
@@ -161,7 +161,9 @@ abstract class BaseSoftButtonManager extends BaseSubManager {
                 updateTransactionQueueSuspended();
             }
         };
-        this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        if (internalInterface.getSystemCapabilityManager() != null) {
+            this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        }
 
         // Add OnButtonPressListener to notify SoftButtonObjects when there is a button press
         this.onButtonPressListener = new OnRPCNotificationListener() {
@@ -232,7 +234,9 @@ abstract class BaseSoftButtonManager extends BaseSubManager {
         internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, onHMIStatusListener);
         internalInterface.removeOnRPCNotificationListener(FunctionID.ON_BUTTON_PRESS, onButtonPressListener);
         internalInterface.removeOnRPCNotificationListener(FunctionID.ON_BUTTON_EVENT, onButtonEventListener);
-        internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        if (internalInterface.getSystemCapabilityManager() != null) {
+            internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        }
     }
 
     private Queue newTransactionQueue() {
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
index 9c756e758..4bdfcb441 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java
@@ -140,7 +140,9 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager {
 
 		// remove listeners
 		internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
-		internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		if (internalInterface.getSystemCapabilityManager() != null) {
+			internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		}
 
 		super.dispose();
 	}
@@ -502,6 +504,8 @@ abstract class BaseTextAndGraphicManager extends BaseSubManager {
 				updateTransactionQueueSuspended();
 			}
 		};
-		this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		if (internalInterface.getSystemCapabilityManager() != null) {
+			this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		}
 	}
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
index 0abb94e0a..0e91747a8 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
@@ -149,7 +149,9 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
 
         // remove listeners
         internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
-        internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        if (internalInterface.getSystemCapabilityManager() != null) {
+            internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        }
 
         super.dispose();
     }
@@ -537,8 +539,10 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
                 defaultMainWindowCapability = null;
             }
         };
-        this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
-
+        if (internalInterface.getSystemCapabilityManager() != null) {
+            this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplayCapabilityListener);
+        }
+        
         // HMI UPDATES
         hmiListener = new OnRPCNotificationListener() {
             @Override
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java
index 8672b1b83..290a1f05f 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/DeleteChoicesOperation.java
@@ -74,7 +74,7 @@ class DeleteChoicesOperation extends Task {
 		if (deleteChoices.size() > 0) {
 
 			if (internalInterface.get() != null) {
-				internalInterface.get().sendRequests(deleteChoices, new OnMultipleRequestListener() {
+				internalInterface.get().sendRPCs(deleteChoices, new OnMultipleRequestListener() {
 					@Override
 					public void onUpdate(int remainingRequests) {
 					}
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
index d8a921b8a..21bf2d712 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java
@@ -154,7 +154,7 @@ class PreloadChoicesOperation extends Task {
 		}
 
 		if (internalInterface.get() != null){
-			internalInterface.get().sendRequests(choiceRPCs, new OnMultipleRequestListener() {
+			internalInterface.get().sendRPCs(choiceRPCs, new OnMultipleRequestListener() {
 				@Override
 				public void onUpdate(int remainingRequests) {
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
index c4c18ee16..053f90c8c 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseMenuManager.java
@@ -151,7 +151,9 @@ abstract class BaseMenuManager extends BaseSubManager {
 		// remove listeners
 		internalInterface.removeOnRPCNotificationListener(FunctionID.ON_HMI_STATUS, hmiListener);
 		internalInterface.removeOnRPCNotificationListener(FunctionID.ON_COMMAND, commandListener);
-		internalInterface.removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		if (internalInterface.getSystemCapabilityManager() != null) {
+			internalInterface.getSystemCapabilityManager().removeOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		}
 
 		super.dispose();
 	}
@@ -1020,7 +1022,9 @@ abstract class BaseMenuManager extends BaseSubManager {
 				defaultMainWindowCapability = null;
 			}
 		};
-		this.internalInterface.addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		if (internalInterface.getSystemCapabilityManager() != null) {
+			this.internalInterface.getSystemCapabilityManager().addOnSystemCapabilityListener(SystemCapabilityType.DISPLAYS, onDisplaysCapabilityListener);
+		}
 
 		// HMI UPDATES
 		hmiListener = new OnRPCNotificationListener() {
@@ -1299,7 +1303,7 @@ abstract class BaseMenuManager extends BaseSubManager {
 			return;
 		}
 
-		internalInterface.sendRequests(deleteCommands, new OnMultipleRequestListener() {
+		internalInterface.sendRPCs(deleteCommands, new OnMultipleRequestListener() {
 			@Override
 			public void onUpdate(int remainingRequests) {
 
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
index f96452bb2..b6ec94930 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/BaseVoiceCommandManager.java
@@ -190,7 +190,7 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 
 		List<DeleteCommand> deleteVoiceCommands = deleteCommandsForVoiceCommands(oldVoiceCommands);
 		oldVoiceCommands.clear();
-		internalInterface.sendRequests(deleteVoiceCommands, new OnMultipleRequestListener() {
+		internalInterface.sendRPCs(deleteVoiceCommands, new OnMultipleRequestListener() {
 			@Override
 			public void onUpdate(int remainingRequests) {
 
@@ -223,7 +223,7 @@ abstract class BaseVoiceCommandManager extends BaseSubManager {
 
 		inProgressUpdate = addCommandsForVoiceCommands(voiceCommands);
 
-		internalInterface.sendRequests(inProgressUpdate, new OnMultipleRequestListener() {
+		internalInterface.sendRPCs(inProgressUpdate, new OnMultipleRequestListener() {
 			@Override
 			public void onUpdate(int remainingRequests) {
 
diff --git a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
index 0c46e3743..d8a70b062 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
@@ -4,6 +4,7 @@ import androidx.annotation.NonNull;
 
 import com.livio.taskmaster.Taskmaster;
 import com.smartdevicelink.managers.lifecycle.OnSystemCapabilityListener;
+import com.smartdevicelink.managers.lifecycle.SystemCapabilityManager;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCMessage;
@@ -94,58 +95,18 @@ public interface ISdl {
     void startVideoService(VideoStreamingParameters parameters, boolean encrypted);
 
     /**
-     * Starts the video streaming service
-     * @param isEncrypted flag to start this service with encryption or not
-     * @param parameters desired video streaming params for this sevice to be started with
-     */
-    @Deprecated
-    IVideoStreamListener startVideoStream(boolean isEncrypted, VideoStreamingParameters parameters);
-
-    /**
-     * Starts the Audio streaming service
-     * @param encrypted flag to start this service with encryption or not
-     */
-    @Deprecated
-    void startAudioService(boolean encrypted, AudioStreamingCodec codec, AudioStreamingParams params);
-
-    /**
      * Starts the Audio streaming service
      * @param encrypted flag to start this service with encryption or not
      */
     void startAudioService(boolean encrypted);
 
     /**
-     * Start Audio Stream and return IAudioStreamListener
-     * @param isEncrypted whether or not the audio stream should be encrypted
-     * @param codec the codec that should be used for the audio stream
-     * @param params specific options and settings associated with the audio stream
-     * @return IAudioStreamListener, an interface that allows the writing of audio data
-     */
-    @Deprecated
-    IAudioStreamListener startAudioStream(boolean isEncrypted, AudioStreamingCodec codec, AudioStreamingParams params);
-
-    /**
-     * Pass an RPC message through the proxy to be sent to the connected module
-     * @param message RPCRequest that should be sent to the module
-     */
-    @Deprecated
-    void sendRPCRequest(RPCRequest message);
-
-    /**
      * Pass an RPC message through the proxy to be sent to the connected module
      * @param message RPCMessage that should be sent to the module
      */
     void sendRPC(RPCMessage message);
 
     /**
-     * Pass a list of RPC requests through the proxy to be sent to core
-     * @param rpcs List of RPC requests
-     * @param listener OnMultipleRequestListener that is called between requests and after all are processed
-     */
-    @Deprecated
-    void sendRequests(List<? extends RPCRequest> rpcs, final OnMultipleRequestListener listener);
-
-    /**
      * Pass a list of RPC messages through the proxy to be sent to core
      * @param rpcs List of RPC messages
      * @param listener OnMultipleRequestListener that is called between requests and after all are processed
@@ -208,65 +169,12 @@ public interface ISdl {
     boolean removeOnRPCListener(FunctionID responseId, OnRPCListener listener);
 
     /**
-     * Get SystemCapability Object
-     * @param systemCapabilityType a system capability type that should be retrieved
-     * @return the system capability provided if available, null if not
-     * @deprecated use {@link #getCapability(SystemCapabilityType, OnSystemCapabilityListener, boolean)} instead.
-     */
-    @Deprecated
-    Object getCapability(SystemCapabilityType systemCapabilityType);
-
-    /**
-     * Get Capability
-     * @param systemCapabilityType a system capability type that should be retrieved
-     * @param scListener listener that will be called when the system capability is retrieved. If already cached, it
-     *                   will be called immediately
-     * @deprecated use {@link #getCapability(SystemCapabilityType, OnSystemCapabilityListener, boolean)} instead.
-     */
-    @Deprecated
-    void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener);
-
-    /** Gets the capability object that corresponds to the supplied capability type by returning the currently cached value immediately (or null) as well as 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.
-     * <strong>If capability is not cached, the method will return null and trigger the supplied listener when the capability becomes available</strong>
-     * @param systemCapabilityType type of capability desired
-     * @param scListener callback to execute upon retrieving capability
-     * @param forceUpdate flag to force getting a new fresh copy of the capability from the head unit even if it is cached
-     * @return desired capability if it is cached in the manager, otherwise returns a null object
-     */
-    @Deprecated
-    Object getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener, boolean forceUpdate);
-
-    /**
      * Get RegisterAppInterfaceResponse
      * @return the RegisterAppInterfaceResponse if available, null if not
      */
     RegisterAppInterfaceResponse getRegisterAppInterfaceResponse();
 
     /**
-     * Check if capability is supported
-     * @param systemCapabilityType a system capability type that should be checked for support
-     * @return Boolean whether or not the supplied capability type is supported on the connected module
-     */
-    @Deprecated
-    boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType);
-
-    /**
-     * Add a listener to be called whenever a new capability is retrieved
-     * @param systemCapabilityType Type of capability desired
-     * @param listener callback to execute upon retrieving capability
-     */
-    @Deprecated
-    void addOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener);
-
-    /**
-     * Remove an OnSystemCapabilityListener that was previously added
-     * @param systemCapabilityType Type of capability
-     * @param listener the listener that should be removed
-     */
-    @Deprecated
-    boolean removeOnSystemCapabilityListener(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener listener);
-
-    /**
      * Check to see if a transport is available to start/use the supplied service.
      * @param serviceType the session that should be checked for transport availability
      * @return true if there is either a supported
@@ -296,4 +204,6 @@ public interface ISdl {
     void startRPCEncryption();
 
     Taskmaster getTaskmaster();
+
+    SystemCapabilityManager getSystemCapabilityManager();
 }